diff --git a/src/main/java/com/nis/domain/FunctionRegionDict.java b/src/main/java/com/nis/domain/FunctionRegionDict.java
index de8dc0f9c..130984d68 100644
--- a/src/main/java/com/nis/domain/FunctionRegionDict.java
+++ b/src/main/java/com/nis/domain/FunctionRegionDict.java
@@ -16,6 +16,60 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	private String configDesc;
 	private Integer isMaat;
 	private Integer regionType;
+	private String configMultiKeywords;
+	private String configHex;
+	private String configExprType;
+	private String configMatchMethod;
+	private String configServiceType;
+	private String configIpPortShow;
+	private String configIpType;
+	private String configIpPattern;
+	private String configPortPattern;
+	private String configDirection;
+	private String configProtocol;
+	
+	public String getConfigIpPortShow() {
+		return configIpPortShow;
+	}
+	public void setConfigIpPortShow(String configIpPortShow) {
+		this.configIpPortShow = configIpPortShow;
+	}
+	public String getConfigIpType() {
+		return configIpType;
+	}
+	public void setConfigIpType(String configIpType) {
+		this.configIpType = configIpType;
+	}
+	public String getConfigIpPattern() {
+		return configIpPattern;
+	}
+	public void setConfigIpPattern(String configIpPattern) {
+		this.configIpPattern = configIpPattern;
+	}
+	public String getConfigPortPattern() {
+		return configPortPattern;
+	}
+	public void setConfigPortPattern(String configPortPattern) {
+		this.configPortPattern = configPortPattern;
+	}
+	public String getConfigDirection() {
+		return configDirection;
+	}
+	public void setConfigDirection(String configDirection) {
+		this.configDirection = configDirection;
+	}
+	public String getConfigProtocol() {
+		return configProtocol;
+	}
+	public void setConfigProtocol(String configProtocol) {
+		this.configProtocol = configProtocol;
+	}
+	public String getConfigServiceType() {
+		return configServiceType;
+	}
+	public void setConfigServiceType(String configServiceType) {
+		this.configServiceType = configServiceType;
+	}
 	public Integer getDictId() {
 		return dictId;
 	}
@@ -64,5 +118,30 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
 	public void setRegionType(Integer regionType) {
 		this.regionType = regionType;
 	}
+	public String getConfigMultiKeywords() {
+		return configMultiKeywords;
+	}
+	public void setConfigMultiKeywords(String configMultiKeywords) {
+		this.configMultiKeywords = configMultiKeywords;
+	}
+	public String getConfigHex() {
+		return configHex;
+	}
+	public void setConfigHex(String configHex) {
+		this.configHex = configHex;
+	}
+	public String getConfigExprType() {
+		return configExprType;
+	}
+	public void setConfigExprType(String configExprType) {
+		this.configExprType = configExprType;
+	}
+	public String getConfigMatchMethod() {
+		return configMatchMethod;
+	}
+	public void setConfigMatchMethod(String configMatchMethod) {
+		this.configMatchMethod = configMatchMethod;
+	}
+	
 
 }
diff --git a/src/main/java/com/nis/domain/FunctionServiceDict.java b/src/main/java/com/nis/domain/FunctionServiceDict.java
index 174097d23..42215de2b 100644
--- a/src/main/java/com/nis/domain/FunctionServiceDict.java
+++ b/src/main/java/com/nis/domain/FunctionServiceDict.java
@@ -16,6 +16,14 @@ public class FunctionServiceDict extends BaseCfg<FunctionServiceDict> {
 	private String serviceName;
 	private String serviceDesc;
 	private String actionCode;
+	private Integer regionCode;
+	
+	public Integer getRegionCode() {
+		return regionCode;
+	}
+	public void setRegionCode(Integer regionCode) {
+		this.regionCode = regionCode;
+	}
 	public Integer getDictId() {
 		return dictId;
 	}
diff --git a/src/main/java/com/nis/util/CodeDicUtils.java b/src/main/java/com/nis/util/CodeDicUtils.java
index 580042d61..1bd1a7405 100644
--- a/src/main/java/com/nis/util/CodeDicUtils.java
+++ b/src/main/java/com/nis/util/CodeDicUtils.java
@@ -51,105 +51,126 @@ public class CodeDicUtils {
 //			}
 //			putCache(CACHE_MENU_LIST, menuList);
 //		}
-		
+		//注释码表获取缓存，增加修改清除缓存功能后可以添加缓存
 		List<CodeResult> result = new ArrayList<>();
 		if (name.equals(APP_CODE)) {
-			List<CodeAppDic> codeDicList = (List<CodeAppDic>) CacheUtils.get(APP_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeAppDicDao.getCodeDicList();
-				CacheUtils.put(APP_CODE,codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getAppName());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				codeResult.setCoreApp(codeDicList.get(i).getCoreApp());
-				result.add(codeResult);
+//			List<CodeAppDic> codeDicList = (List<CodeAppDic>) CacheUtils.get(APP_CODE);
+			List<CodeAppDic> codeDicList = codeAppDicDao.getCodeDicList();
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeAppDicDao.getCodeDicList();
+//				CacheUtils.put(APP_CODE,codeDicList);
+//			}
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getAppName());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					codeResult.setCoreApp(codeDicList.get(i).getCoreApp());
+					result.add(codeResult);
+				}
 			}
 			return result;
 
 		} else if (name.equals(BEHAVIOR_CODE)) {
-			List<CodeBehaviorTypeDic> codeDicList = (List<CodeBehaviorTypeDic>) CacheUtils.get(BEHAVIOR_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-			codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
-			CacheUtils.put(BEHAVIOR_CODE,codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getBehaviorType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeBehaviorTypeDic> codeDicList = (List<CodeBehaviorTypeDic>) CacheUtils.get(BEHAVIOR_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//			codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
+//			CacheUtils.put(BEHAVIOR_CODE,codeDicList);
+//			}
+			List<CodeBehaviorTypeDic> codeDicList = codeBehaviorTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getBehaviorType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(BROWSER_CODE)) {
-			List<CodeBrowserTypeDic> codeDicList = (List<CodeBrowserTypeDic>) CacheUtils.get(BROWSER_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeBrowserTypeDicDao.getCodeDicList();
-				CacheUtils.put(BROWSER_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getBrowserType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeBrowserTypeDic> codeDicList = (List<CodeBrowserTypeDic>) CacheUtils.get(BROWSER_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeBrowserTypeDicDao.getCodeDicList();
+//				CacheUtils.put(BROWSER_CODE, codeDicList);
+//			}
+			List<CodeBrowserTypeDic> codeDicList = codeBrowserTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getBrowserType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(OS_CODE)) {
-			List<CodeOsTypeDic> codeDicList = (List<CodeOsTypeDic>) CacheUtils.get(OS_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeOsTypeDicDao.getCodeDicList();
-				CacheUtils.put(OS_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getOsType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeOsTypeDic> codeDicList = (List<CodeOsTypeDic>) CacheUtils.get(OS_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeOsTypeDicDao.getCodeDicList();
+//				CacheUtils.put(OS_CODE, codeDicList);
+//			}
+			List<CodeOsTypeDic> codeDicList = codeOsTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getOsType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(PROTOCOL_CODE)) {
-			List<CodeProtocolTypeDic> codeDicList = (List<CodeProtocolTypeDic>) CacheUtils.get(PROTOCOL_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeProtocolTypeDicDao.getCodeDicList();
-				CacheUtils.put(PROTOCOL_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getProtocolType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeProtocolTypeDic> codeDicList = (List<CodeProtocolTypeDic>) CacheUtils.get(PROTOCOL_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeProtocolTypeDicDao.getCodeDicList();
+//				CacheUtils.put(PROTOCOL_CODE, codeDicList);
+//			}
+			List<CodeProtocolTypeDic> codeDicList = codeProtocolTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getProtocolType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(SERVICE_CODE)) {
-			List<CodeServiceTypeDic> codeDicList = (List<CodeServiceTypeDic>) CacheUtils.get(SERVICE_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeServiceTypeDicDao.getCodeDicList();
-				CacheUtils.put(SERVICE_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getServiceType());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeServiceTypeDic> codeDicList = (List<CodeServiceTypeDic>) CacheUtils.get(SERVICE_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeServiceTypeDicDao.getCodeDicList();
+//				CacheUtils.put(SERVICE_CODE, codeDicList);
+//			}
+			List<CodeServiceTypeDic> codeDicList = codeServiceTypeDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getServiceType());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		} else if (name.equals(WEB_CODE)) {
-			List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
-			if(StringUtil.isEmpty(codeDicList)){
-				codeDicList = codeWebServiceDicDao.getCodeDicList();
-				CacheUtils.put(WEB_CODE, codeDicList);
-			}
-			for (int i = 0; i < codeDicList.size(); i++) {
-				CodeResult codeResult = new CodeResult();
-				codeResult.setItem(codeDicList.get(i).getWebsite());
-				codeResult.setCode(codeDicList.get(i).getViewCode());
-				
-				result.add(codeResult);
+//			List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeWebServiceDicDao.getCodeDicList();
+//				CacheUtils.put(WEB_CODE, codeDicList);
+//			}
+			List<CodeWebServiceDic> codeDicList = codeWebServiceDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getWebsite());
+					codeResult.setCode(codeDicList.get(i).getViewCode());
+					
+					result.add(codeResult);
+				}
 			}
 			return result;
 		}
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
index 328afda87..5576b03d5 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
@@ -247,7 +247,7 @@ public class FileTransferCfgController  extends BaseController{
 		if(StringUtils.isNotBlank(ids)){
 			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids));
 			
-			// 添加配置域Key,用于新增页面判断
+			// 添加配置域Key,用于修改页面区分各域配置
 			P2pHashCfg hashCfg = new P2pHashCfg();
 			hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION);
 			entity.setP2pHash(hashCfg);
@@ -270,7 +270,7 @@ public class FileTransferCfgController  extends BaseController{
 			
 			initUpdateFormCondition(model,entity);
 		}else{
-			// 添加配置域Key,用于修改页面判断
+			// 添加配置域Key,用于新增页面区分各域配置
 			P2pHashCfg hashCfg = new P2pHashCfg();
 			hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION);
 			entity.setP2pHash(hashCfg);
diff --git a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
index 9d39bbd61..14d58a585 100644
--- a/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
+++ b/src/main/java/com/nis/web/dao/FunctionRegionDictDao.xml
@@ -11,10 +11,23 @@
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
     <result column="is_maat" property="isMaat" jdbcType="INTEGER" />
     <result column="region_type" property="regionType" jdbcType="INTEGER" />
+    <result column="config_multi_keywords" property="configMultiKeywords" jdbcType="VARCHAR" />
+    <result column="config_hex" property="configHex" jdbcType="VARCHAR" />
+    <result column="config_expr_type" property="configExprType" jdbcType="VARCHAR" />
+    <result column="config_match_method" property="configMatchMethod" jdbcType="VARCHAR" />
+    <result column="config_service_type" property="configServiceType" jdbcType="VARCHAR" />
+    <result column="config_ip_port_show" property="configIpPortShow" jdbcType="VARCHAR" />
+    <result column="config_ip_type" property="configIpType" jdbcType="VARCHAR" />
+    <result column="config_ip_pattern" property="configIpPattern" jdbcType="VARCHAR" />
+    <result column="config_port_pattern" property="configPortPattern" jdbcType="VARCHAR" />
+    <result column="config_direction" property="configDirection" jdbcType="VARCHAR" />
+    <result column="config_protocol" property="configProtocol" jdbcType="VARCHAR" />
   </resultMap>
   
   <sql id="Base_Column_List" >
     dict_id, function_id, config_region_value,config_region_code, config_district, config_desc, is_valid,is_maat,region_type
+    ,config_multi_keywords,config_hex,config_expr_type,config_match_method,config_service_type,config_ip_port_show,config_ip_type,
+    config_ip_pattern,config_port_pattern,config_direction,config_protocol
   </sql>
   <select id="getList" resultMap="BaseResultMap"  >
     select 
diff --git a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml
index e823f5598..69547cd73 100644
--- a/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml
+++ b/src/main/java/com/nis/web/dao/FunctionServiceDictDao.xml
@@ -11,10 +11,11 @@
     <result column="service_name" property="serviceName" jdbcType="VARCHAR" />
     <result column="service_desc" property="serviceDesc" jdbcType="VARCHAR" />
     <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="region_code" property="regionCode" jdbcType="INTEGER" />
   </resultMap>
   
   <sql id="Base_Column_List" >
-    dict_id, function_id, protocol_id, action,action_code, service_id, service_name,service_desc,is_valid
+    dict_id, function_id, protocol_id, action,action_code, service_id, service_name,service_desc,is_valid,region_code
   </sql>
   <select id="getList" resultMap="BaseResultMap" >
     select 
diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index 723943a81..aa3852253 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -558,7 +558,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	 * @param entity
 	 */
 	public void saveP2pCfg(CfgIndexInfo entity){
-		//设置区域运营商信息
+		// 设置区域运营商信息
 		setAreaEffectiveIds(entity);
 		if(entity.getCfgId()==null){
 			Integer compileId = 0;
@@ -608,7 +608,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 						}
 					}
 				}
-				//保存区域IP信息
+				// 保存区域IP信息
 				if(entity.getAreaCfg()!=null){
 					for(AreaIpCfg cfg:entity.getAreaCfg()){
 						cfg.initDefaultValue();
@@ -623,8 +623,16 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			}
 			
 		}else{
+			// 审核未通过状态的配置 修改后状态改为未审核
+			CfgIndexInfo cfgIndexInfo = fileTransferCfgDao.getCfgIndexInfo(entity.getCfgId());
+			if(cfgIndexInfo.getIsAudit() == 2) {
+				entity.setIsValid(0);
+				entity.setIsAudit(0);
+			}
+			entity.setEditTime(new Date());
+			entity.setEditorId(entity.getCurrentUser().getId());
 			fileTransferCfgDao.updateCfgIndex(entity);
-			//无效子配置后，再新增子配置
+			// 删除无效子配置后，再新增子配置
 			fileTransferCfgDao.deleteP2pIpCfg(entity);
 			fileTransferCfgDao.deleteP2pHashCfg(entity);
 			fileTransferCfgDao.deleteP2pKeywordCfg(entity);
@@ -635,6 +643,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			areaIpCfgDao.deleteAreaIpCfg(area);
 			entity.setCreateTime(new Date());
 			entity.setCreatorId(entity.getCurrentUser().getId());
+			
 			if(entity.getIpPortList()!=null){
 				for(IpPortCfg cfg:entity.getIpPortList()){
 					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index ab77dd1e5..9a8d8e5f7 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -774,8 +774,8 @@ res_group_num=Response Group Number
 policy_number_value_valid=The policy number can only be 0, or more than 100
 policy_number_value_unique=The policy number has already existed
 location=Location
-extra=Abroad
-intra=Territory
+extra=Outbound
+intra=Inbound
 #=============about Maintenance=========
 #=============some validation===========
 line=line %s
@@ -1068,4 +1068,13 @@ website=Website
 
 p2p_ip_config_type=IP Config Type
 p2p_hash_type=Hash Type
-NTC_SUBSCRIBE_ID=Certification Mark Configuration
\ No newline at end of file
+NTC_SUBSCRIBE_ID=Certification Mark Configuration
+
+app_header_config=APP Header Feature
+app_ssl_config=APP SSL Cert Feature
+ip_intercepter_replace=IP Intercept Replace
+domain_intercepter_replace=Domain Intercept Replace
+ip_intercepter_ratelimit=IP Intercept Ratelimit
+domain_intercepter_ratelimit=Domain Intercept Ratelimit
+app_built_in_features_config=APP Built-in Features
+app_ssl_config=APP SSL Cert Feature
diff --git a/src/main/resources/sql/add_function_region_303.sql b/src/main/resources/sql/add_function_region_303.sql
new file mode 100644
index 000000000..9150a9ba9
--- /dev/null
+++ b/src/main/resources/sql/add_function_region_303.sql
@@ -0,0 +1 @@
+INSERT INTO function_region_dict (function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type) VALUES(303,1,'LIMIT_DOMAIN','域名限速',1,1,2)
\ No newline at end of file
diff --git a/src/main/resources/sql/add_function_region_dict_columns.sql b/src/main/resources/sql/add_function_region_dict_columns.sql
new file mode 100644
index 000000000..10bca3fa5
--- /dev/null
+++ b/src/main/resources/sql/add_function_region_dict_columns.sql
@@ -0,0 +1,7 @@
+ALTER TABLE function_region_dict ADD config_ip_port_show VARCHAR(10) NULL COMMENT '1,展示源IP/端口2;展示目目的IP/端口;使用逗号分隔';
+ALTER TABLE function_region_dict ADD config_ip_type VARCHAR(20) NULL COMMENT 'ip的类型，有4,6,46,64,10几种类型,使用逗号分隔';
+ALTER TABLE function_region_dict ADD config_ip_pattern VARCHAR(10) NULL COMMENT 'ip的格式 1:ip掩码;2:IP范围;3:IP;使用逗号分隔';
+ALTER TABLE function_region_dict ADD config_port_pattern VARCHAR(10) NULL COMMENT '端口的格式，1:port;2:port_mask;使用逗号分隔';
+ALTER TABLE function_region_dict ADD config_direction VARCHAR(10) NULL COMMENT 'IP方向0,双向;1,单向.使用逗号分隔';
+ALTER TABLE function_service_dict ADD region_code INT(11) NULL COMMENT 'function_region_dict 表中的config_region_code字段值';
+ALTER TABLE function_region_dict ADD config_protocol VARCHAR(20) NULL COMMENT '协议 0:任意;6:TCP;17:UDP;1:ICMP;50:ESP;51:AH';
diff --git a/src/main/resources/sql/function_region_dict_add_colunm.sql b/src/main/resources/sql/function_region_dict_add_colunm.sql
new file mode 100644
index 000000000..7ba52d96c
--- /dev/null
+++ b/src/main/resources/sql/function_region_dict_add_colunm.sql
@@ -0,0 +1,10 @@
+alter table function_region_dict add config_multi_keywords varchar(2)  COMMENT '是否可以多个关键字';
+alter table function_region_dict add config_hex varchar(20)  COMMENT '十六进制 单选：0 非十六进制 大小不敏感 1 十六进制，大小写不敏感 2非十六进制 大小写敏感 默认为0';
+alter table function_region_dict add config_expr_type varchar(20)  COMMENT '是否表达式 ：单选 0 无表达式 1表达式  默认为0';
+alter table function_region_dict add config_match_method varchar(20)  COMMENT '匹配方式 下拉 0：子串匹配；1：右匹配；2：左匹配；3：完全匹配  默认为0 expr_type:0时有意义，其它情况必须置0。';
+alter table function_region_dict add config_service_type varchar(50)  COMMENT '域业务类型，domain，url，dns，
+
+INSERT INTO function_region_dict (`dict_id`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_multi_keywords`, `config_hex`, `config_expr_type`, `config_match_method`) VALUES ('158', '510', '3', 'NTC_P2P_KEYWORDS', '', 'p2p文件内容配置', '1', NULL, NULL, NULL, NULL, '1', '2', '1', '0,1,2', '0,1', '0,1,2,3');
+INSERT INTO function_region_dict (`dict_id`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_multi_keywords`, `config_hex`, `config_expr_type`, `config_match_method`) VALUES ('159', '510', '2', 'NTC_SUBSCRIBE_ID', '', 'p2p subscribe配置', '1', NULL, NULL, NULL, NULL, '1', '2', '1', '0,1,2', '0,1', '0,1,2,3');
+INSERT INTO function_region_dict (`dict_id`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_multi_keywords`, `config_hex`, `config_expr_type`, `config_match_method`) VALUES ('160', '510', '1', 'NTC_P2P_HASH_BIN', NULL, 'p2p hash配置', '1', NULL, NULL, NULL, NULL, '1', '2', '1', '1', '0,1', '0,1,2,3');
+INSERT INTO function_region_dict (`dict_id`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_multi_keywords`, `config_hex`, `config_expr_type`, `config_match_method`) VALUES ('163', '510', '4', 'NTC_P2P_IP', NULL, 'p2p ip配置', '1', NULL, NULL, NULL, NULL, '1', '1', NULL, NULL, NULL, NULL);
diff --git a/src/main/resources/sql/function_service_dict_add_colunm.sql b/src/main/resources/sql/function_service_dict_add_colunm.sql
new file mode 100644
index 000000000..9612b5ea3
--- /dev/null
+++ b/src/main/resources/sql/function_service_dict_add_colunm.sql
@@ -0,0 +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`) VALUES ('101', '510', '0', '16', 'reject', '34', 'p2p_reject', NULL, '1', NULL, NULL, NULL, NULL);
diff --git a/src/main/resources/sql/p2p_hash_cfg.sql b/src/main/resources/sql/p2p_hash_cfg.sql
new file mode 100644
index 000000000..3f017cbe2
--- /dev/null
+++ b/src/main/resources/sql/p2p_hash_cfg.sql
@@ -0,0 +1,55 @@
+/*
+Navicat MariaDB Data Transfer
+
+Source Server         : 10.0.6.249
+Source Server Version : 100214
+Source Host           : 10.0.6.249:3306
+Source Database       : gwall
+
+Target Server Type    : MariaDB
+Target Server Version : 100214
+File Encoding         : 65001
+
+Date: 2018-08-18 21:11:12
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for p2p_hash_cfg
+-- ----------------------------
+DROP TABLE IF EXISTS `p2p_hash_cfg`;
+CREATE TABLE `p2p_hash_cfg` (
+  `cfg_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增',
+  `cfg_desc` varchar(128) DEFAULT NULL,
+  `cfg_keywords` varchar(64) NOT NULL,
+  `action` int(11) NOT NULL COMMENT '1:阻断，2：监测， 5： FD 白名单，6：监测白名单，7: FD 监测都白名单，应与业务ID所代表的逻辑相匹配，8-灰名单',
+  `is_valid` int(11) NOT NULL COMMENT '0无效，1有效，-1删除;1）	未审核时配置可删除;2）	审核通过，此字段置1;3）	取消审核通过，此字段置0',
+  `is_audit` int(11) NOT NULL COMMENT '0未审核，1审核通过，2审核未通过，3取消审核通过;1）	审核未通过，配置可修改;2）	审核通过，配置不可删除，只能取消审核通过',
+  `creator_id` int(11) NOT NULL COMMENT '取自sys_user.id',
+  `create_time` datetime NOT NULL,
+  `editor_id` int(11) DEFAULT NULL COMMENT '取自sys_user.id',
+  `edit_time` datetime DEFAULT NULL,
+  `auditor_id` int(11) DEFAULT NULL COMMENT '取自sys_user.id',
+  `audit_time` datetime DEFAULT NULL,
+  `service_id` int(11) NOT NULL COMMENT '参考系统业务类型管理表',
+  `request_id` int(11) NOT NULL COMMENT '取自request_info.id',
+  `compile_id` int(11) NOT NULL COMMENT '取自服务接口返回的maat配置的编译id，配置初始入库时获取。',
+  `is_area_effective` int(11) NOT NULL COMMENT '0否，1是',
+  `classify` varchar(128) DEFAULT NULL COMMENT '分类id，多个用英文逗号分隔',
+  `attribute` varchar(128) DEFAULT NULL COMMENT '性质id，多个用英文逗号分隔',
+  `lable` varchar(128) DEFAULT NULL COMMENT '标签id,多个用英文逗号分隔',
+  `expr_type` int(11) NOT NULL COMMENT '0：无表达式，1：与表达式',
+  `match_method` int(11) NOT NULL COMMENT 'expr_type:0时有意义，其它情况必须置0。0：子串匹配；1：右匹配；2：左匹配；3：完全匹配',
+  `is_hexbin` int(11) NOT NULL COMMENT '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+  `area_effective_ids` varchar(1024) DEFAULT NULL COMMENT '多个英文逗号分隔',
+  `function_id` int(11) DEFAULT NULL,
+  `cfg_region_code` int(11) DEFAULT NULL,
+  `cfg_type` varchar(64) DEFAULT NULL,
+  `user_region1` varchar(1024) DEFAULT '' COMMENT '预留自定义域1',
+  `user_region2` varchar(1024) DEFAULT '' COMMENT '预留自定义域2',
+  `user_region3` varchar(1024) DEFAULT '' COMMENT '预留自定义域3',
+  `user_region4` varchar(1024) DEFAULT '' COMMENT '预留自定义域4',
+  `user_region5` varchar(1024) DEFAULT '' COMMENT '预留自定义域5',
+  PRIMARY KEY (`cfg_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
diff --git a/src/main/resources/sql/p2p_keyword_cfg.sql b/src/main/resources/sql/p2p_keyword_cfg.sql
new file mode 100644
index 000000000..c3af67791
--- /dev/null
+++ b/src/main/resources/sql/p2p_keyword_cfg.sql
@@ -0,0 +1,55 @@
+/*
+Navicat MariaDB Data Transfer
+
+Source Server         : 10.0.6.249
+Source Server Version : 100214
+Source Host           : 10.0.6.249:3306
+Source Database       : gwall
+
+Target Server Type    : MariaDB
+Target Server Version : 100214
+File Encoding         : 65001
+
+Date: 2018-08-18 21:11:57
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for p2p_keyword_cfg
+-- ----------------------------
+DROP TABLE IF EXISTS `p2p_keyword_cfg`;
+CREATE TABLE `p2p_keyword_cfg` (
+  `cfg_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增',
+  `cfg_desc` varchar(128) DEFAULT NULL,
+  `cfg_keywords` varchar(64) NOT NULL,
+  `action` int(11) NOT NULL COMMENT '1:阻断，2：监测， 5： FD 白名单，6：监测白名单，7: FD 监测都白名单，应与业务ID所代表的逻辑相匹配，8-灰名单',
+  `is_valid` int(11) NOT NULL COMMENT '0无效，1有效，-1删除;1）	未审核时配置可删除;2）	审核通过，此字段置1;3）	取消审核通过，此字段置0',
+  `is_audit` int(11) NOT NULL COMMENT '0未审核，1审核通过，2审核未通过，3取消审核通过;1）	审核未通过，配置可修改;2）	审核通过，配置不可删除，只能取消审核通过',
+  `creator_id` int(11) NOT NULL COMMENT '取自sys_user.id',
+  `create_time` datetime NOT NULL,
+  `editor_id` int(11) DEFAULT NULL COMMENT '取自sys_user.id',
+  `edit_time` datetime DEFAULT NULL,
+  `auditor_id` int(11) DEFAULT NULL COMMENT '取自sys_user.id',
+  `audit_time` datetime DEFAULT NULL,
+  `service_id` int(11) NOT NULL COMMENT '参考系统业务类型管理表',
+  `request_id` int(11) NOT NULL COMMENT '取自request_info.id',
+  `compile_id` int(11) NOT NULL COMMENT '取自服务接口返回的maat配置的编译id，配置初始入库时获取。',
+  `is_area_effective` int(11) NOT NULL COMMENT '0否，1是',
+  `classify` varchar(128) DEFAULT NULL COMMENT '分类id，多个用英文逗号分隔',
+  `attribute` varchar(128) DEFAULT NULL COMMENT '性质id，多个用英文逗号分隔',
+  `lable` varchar(128) DEFAULT NULL COMMENT '标签id,多个用英文逗号分隔',
+  `expr_type` int(11) NOT NULL COMMENT '0：无表达式，1：与表达式',
+  `match_method` int(11) NOT NULL COMMENT 'expr_type:0时有意义，其它情况必须置0。0：子串匹配；1：右匹配；2：左匹配；3：完全匹配',
+  `is_hexbin` int(11) NOT NULL COMMENT '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+  `area_effective_ids` varchar(1024) DEFAULT NULL COMMENT '多个英文逗号分隔',
+  `function_id` int(11) DEFAULT NULL,
+  `cfg_region_code` int(11) DEFAULT NULL,
+  `cfg_type` varchar(64) DEFAULT NULL,
+  `user_region1` varchar(1024) DEFAULT '' COMMENT '预留自定义域1',
+  `user_region2` varchar(1024) DEFAULT '' COMMENT '预留自定义域2',
+  `user_region3` varchar(1024) DEFAULT '' COMMENT '预留自定义域3',
+  `user_region4` varchar(1024) DEFAULT '' COMMENT '预留自定义域4',
+  `user_region5` varchar(1024) DEFAULT '' COMMENT '预留自定义域5',
+  PRIMARY KEY (`cfg_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8;
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index 47e719cb8..94791fe3b 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -1,115 +1,256 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
-<h3 class="form-section"><spring:message code="block_config"/></h3>
+<html>
+<head>
+<title></title>
+		<input type="hidden" name="cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode }">
+		<input type="hidden" name="configMultiKeywords" value="${region.configRegionCode }">
+</head>
+<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" onchange="changeDistrict($(this))">
+							<c:forEach items="${fn:split(region.configDistrict,',')}"
+								var="_district">
+								<option value="${_district }"
+									<c:if test="${_cfg.district==_district}">selected</c:if>>${_district }</option>
+							</c:forEach>
+					</select>
+					<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
+				</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"><spring:message code="config_describe"/></label>
-            <div class="col-md-6">
-                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-            </div>
-            <div for="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="key_word"/></label>
-            <div class="col-md-6">
-            	 <input class="form-control required" type="text" name="keywords" value="${_cfg.keywords}">
-            </div>
-            <div for="keywords"></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="keywords" /></label>
+			<!-- 此配置的关键词可以输入多个关键词 -->
+			<c:if test="${region.configMultiKeywords eq 1}">
+				<div class="col-md-6">
+					<input class="form-control required tags" type="text" id="tags_${tabName}"
+						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">
-        <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">
-            	<label class="radio-inline">
-            		<input type="radio" name="exprType" value="1" class="required"
-            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-            		><spring:message code="and_expression"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="exprType" value="0" class="required"
-            			<c:if test="${_cfg.exprType==0}">checked</c:if>
-            		><spring:message code="null_expression"/>
-            	</label>
-            </div>
-            <div for="exprType"></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="match_method"/></label>
-            <div class="col-md-6">
-            	<select name="matchMethod" class="selectpicker select2 form-control required" >
-					<option value=""><spring:message code="select"/></option>
-					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
-					<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
+		<div class="col-md-6">
+			<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,',')}">
+							<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 || (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">
+			<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="${!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="1" class="required"
+		            		><spring:message code="hex"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isHex" value="0" class="required"
+		            		><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"
+		            		><spring:message code="case_senstive"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+		            		><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 _cfg.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="matchMethod"></div>
-        </div>
-    </div>
+			</div>
+			<div for="isHexbin"></div>
+		</div>
+	</div>
 </div>
-<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="whether_hexbinary"/></label>
-            <div class="col-md-6">
-            	<select name="isHexbin" class="selectpicker select2 form-control required">
-					<option value=""><spring:message code="select"/></option>
-					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
-					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
-					<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
-				</select>
-            </div>
-            <div for="isHexbin"></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="whether_area_block"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<input type="radio" name="isAreaEffective" value="1" class="required"
-            			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
-            			<c:if test="${action==2}">disabled</c:if>
-            		><spring:message code="yes"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="isAreaEffective" value="0" class="required"
-            			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
-            			<c:if test="${action==2}">disabled</c:if>
-            		><spring:message code="no"/>
-            	</label>
-            	<c:if test="${action==2}">
-				<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
-				</c:if>
-            </div>
-            <div for="isAreaEffective"></div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="hidden areaType col-md-6">
-        <div class="form-group">
-            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
-            <div class="col-md-6">
-            	<label class="radio-inline">
-            		<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
-            	</label>
-            	<label class="radio-inline">
-            		<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
-            	</label>
-            </div>
-            <div for="areaType"></div>
-            <input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
-        </div>
-    </div>
-</div>
-<!--/row-->
\ No newline at end of file
+</html>
+<script type="text/javascript">
+function changeDistrict(obj){
+	if("others"==obj.val()){
+		obj.parent().siblings(".otherValue").prop("type","text");
+	}else{
+		obj.parent().siblings(".otherValue").prop("type","hidden");
+	}
+}
+</script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp
index d6aef8b4b..0032e71d5 100644
--- a/src/main/webapp/WEB-INF/include/header.jsp
+++ b/src/main/webapp/WEB-INF/include/header.jsp
@@ -92,9 +92,7 @@
 	<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js"></script>
 	</c:otherwise>
 </c:choose>
-<script>
-document.write('<script src="${pageContext.request.contextPath}/static/global/scripts/common.js?ran='+Math.random() + '" type="text/javascript">\<\/script\>');
-</script>
+<script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>
 
diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
index 9c152c94d..6dcd6b3ca 100644
--- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag
@@ -174,6 +174,8 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					}
 					if(url.indexOf("?isAudit") > 1){
 						loading('<spring:message code="onloading"/>');
+					}else if(url.indexOf("export") > 1){
+						closeTip();
 					}
 					//$("#searchForm").submit();
 				}
@@ -236,12 +238,14 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					if(v=="ok"){
 						$("#searchForm").attr("action",url);
 						$("#searchForm").submit();
+						closeTip();
 					}
 				},{buttonsFocus:1});
 				top.$('.jbox-body .jbox-icon').css('top','55px');
 			}else{
 				$("#searchForm").attr("action",url);
 				$("#searchForm").submit();
+				closeTip();
 			}
 		}
 	}
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index a295d9d9a..c5edb169d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -74,14 +74,7 @@ $(function(){
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                        	<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
                        	<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
-                       	<input type="hidden" id="isHexbin" name="isHexbin" value="1">
                        	<!-- 配置域类型 -->
-                   		<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" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <div class="row">
                           <!-- desc and action -->
@@ -140,21 +133,6 @@ $(function(){
 								            <div for="action"></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="match_method" /></label>
-											<div class="col-md-6">
-												<select name="matchMethod"
-													class="selectpicker select2 form-control required">
-													<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
-													</c:forEach> 
-												</select>
-											</div>
-											<div for="matchMethod"></div>
-										</div>
-									</div>
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><font color="red">*</font>
@@ -168,29 +146,201 @@ $(function(){
 										</div>
 									</div>
 								</div>
-								<div class="row hidden">
+								<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" value="${region.configRegionCode}">
+                   			
+								<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="expression_type" /></label>
+												<div class="col-md-6">
+													<c:if test="${!empty region.configExprType}">
+														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
+															<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 || (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">
+											<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="${!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="1" class="required"
+										            		><spring:message code="hex"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isHex" value="0" class="required"
+										            		><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"
+										            		><spring:message code="case_senstive"/>
+										            	</label>
+										            	<label class="radio-inline">
+										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
+										            		><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="expression_type" /></label>
+												<spring:message code="whether_hexbinary" /></label>
 											<div class="col-md-6">
-												<label class="radio-inline hidden"> <input type="radio"
-													name="exprType" value="1"
-													class="required"
-													<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
-														code="and_expression" />
-												</label> <label class="radio-inline"> <input type="radio"
-													name="exprType" value="0"
-													class="required"
-													<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>>
-													<spring:message code="null_expression" />
-												</label>
+												<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 _cfg.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="exprType"></div>
+											<div for="isHexbin"></div>
 										</div>
 									</div>
 								</div>
+								</c:if>
+                   		</c:forEach>
 								<%-- <div class="row">
 									
 									<div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 0fa08d859..350133533 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -75,13 +75,6 @@ $(function(){
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
                        	<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
                        	<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
-                       	<!-- 配置域类型 -->
-                   		<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" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <!-- desc and action -->
                               <div class="row">
@@ -152,103 +145,201 @@ $(function(){
 											<div for="domain"></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="expression_type" /></label>
-											<div class="col-md-6">
-												<label class="radio-inline"> <input type="radio"
-													name="exprType" value="1"
-													class="required"
-													<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
-														code="and_expression" />
-												</label> <label class="radio-inline"> <input type="radio"
-													name="exprType" value="0"
-													class="required"
-													<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>>
-													<spring:message code="null_expression" />
-												</label>
-											</div>
-											<div for="exprType"></div>
-										</div>
 									</div>
-									 <div class="col-md-6">
+							<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" value="${region.configRegionCode}">
+									<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="expression_type" /></label>
+												<div class="col-md-6">
+													<c:if test="${!empty region.configExprType}">
+														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
+															<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 || (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">
+											<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="${!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="1" class="required"
-										            			<c:if test="${_cfg.isHexbin 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.isHexbin ne 1}">checked</c:if>
 										            		><spring:message code="not_hex"/>
 										            	</label>
 										            </div>
 										            <div for="isHex"></div>
 										        </div>
 										    </div>
-	     
-										</div>
-										<div class="row">
-											
-											<div class="col-md-6">
+										    <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.isHexbin==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.isHexbin ne 1}">checked</c:if>
 										            		><spring:message code="case_insenstive"/>
 										            	</label>
 										            </div>
 										            <div for="isCaseInsenstive"></div>
 										        </div>
 										    </div>
-	     
-										</div>
-								<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="match_method" /></label>
-											<div class="col-md-6">
-												<select name="matchMethod"
-													class="selectpicker select2 form-control required">
-													<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
-													</c:forEach> 
-												</select>
-											</div>
-											<div for="matchMethod"></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>
-							<div class="row hidden">
-								<div class="col-md-6">
+								<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:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-													</c:forEach>
+													<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 _cfg.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:if>
+								</c:forEach>
 							</div>
                            <input name="isAreaEffective" type="hidden" value="0">
                            <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 8a0a63e1a..177210e85 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -90,12 +90,6 @@ $(function(){
                        	<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
                        	<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
                        	<!-- 配置域类型 -->
-                   		<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" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <!-- desc and action -->
                               <div class="row">
@@ -127,6 +121,10 @@ $(function(){
 										</div>
 								   </div>
 								</div>
+							<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" value="${region.configRegionCode}">
 								<div class="row">
 								 <div class="row">
 									<div class="col-md-6 hidden">
@@ -155,122 +153,201 @@ $(function(){
 								       </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="district" /></label>
-											<div class="col-md-6">
-												<select name="district"
-													class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
-														<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${!empty region.configDistrict }">
+										<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" onchange="changeDistrict($(this))">
 															<c:forEach items="${fn:split(region.configDistrict,',')}"
 																var="_district">
 																<option value="${_district }"
 																	<c:if test="${_cfg.district==_district}">selected</c:if>>${_district }</option>
 															</c:forEach>
-														</c:forEach>
-												</select>
-												<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
+													</select>
+													<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
+												</div>
+												<div for="district"></div>
 											</div>
-											<div for="district"></div>
 										</div>
-										
-									</div>
-								
+									</c:if>
 								</div>
 								<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>
-											<div class="col-md-6">
-												<input class="form-control required tags" type="text" id="tags_1"
-													name="cfgKeywords"
-													value="${_cfg.cfgKeywords}">
-											</div>
+											<!-- 此配置的关键词可以输入多个关键词 -->
+											<c:if test="${region.configMultiKeywords eq 1}">
+												<div class="col-md-6">
+													<input class="form-control required tags" type="text" id="tags_${tabName}"
+														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 class="col-md-6">
-										<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">
-												<label class="radio-inline"> <input type="radio"
-													name="exprType" value="1"
-													class="required"
-													<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
-														code="and_expression" />
-												</label> <label class="radio-inline"> <input type="radio"
-													name="exprType" value="0"
-													class="required"
-													<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>>
-													<spring:message code="null_expression" />
-												</label>
-											</div>
-											<div for="exprType"></div>
-										</div>
-									</div>
-									
+								
 								</div>
 								<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="match_method" /></label>
-											<div class="col-md-6">
-												<select name="matchMethod"
-													class="selectpicker select2 form-control required">
-													<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-														<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
-													</c:forEach> 
-												</select>
+										<div class="col-md-6">
+											<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,',')}">
+															<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 || (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 for="matchMethod"></div>
 										</div>
-									</div>
-									 <div class="col-md-6">
+									
+										<div class="col-md-6">
+											<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="${!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="1" class="required"
-										            			<c:if test="${_cfg.isHexbin 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.isHexbin ne 1}">checked</c:if>
 										            		><spring:message code="not_hex"/>
 										            	</label>
 										            </div>
 										            <div for="isHex"></div>
 										        </div>
 										    </div>
-	     
-										</div>
-										<div class="row">
-											
-											<div class="col-md-6">
+										    <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.isHexbin==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.isHexbin ne 1}">checked</c:if>
 										            		><spring:message code="case_insenstive"/>
 										            	</label>
 										            </div>
 										            <div for="isCaseInsenstive"></div>
 										        </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">
@@ -279,17 +356,42 @@ $(function(){
 											<div class="col-md-6">
 												<select name="isHexbin"
 													class="selectpicker select2 form-control required">
-													<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-														<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-													</c:forEach>
+													<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 _cfg.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> 
+								</div>
 							</div> 
+							</c:if>
+                   		</c:forEach>
                          <input name="isAreaEffective" type="hidden" value="0">
                            <%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
 							<input name="requestId" value="0" type="hidden">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index efa40d57b..95945d6c1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -92,13 +92,6 @@ $(function(){
                        	<input type="hidden" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-                       	<!-- 配置域类型 -->
-                   		<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" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <!-- desc and action -->
                               <div class="row">
@@ -137,7 +130,12 @@ $(function(){
 								   </div>
 								</div>
 							<!-- desc and action -->
-                           <%@include file="/WEB-INF/include/form/stringInfo.jsp" %>
+								<!-- 配置域类型 -->
+	                   		<c:forEach items="${regionList}" var="region">
+	                   			<c:if test="${_cfg.functionId eq region.functionId}">
+		                           <%@include file="/WEB-INF/include/form/complexInfo.jsp" %>
+	                   			</c:if>
+	                   		</c:forEach>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index 95809f90b..f135211a5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -83,13 +83,6 @@ $(function(){
                        	<input type="hidden" name="compileId" value="${_cfg.compileId}">
                        	<input type="hidden" name="functionId" value="${_cfg.functionId}">
                        	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-                       	<!-- 配置域类型 -->
-                   		<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" value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
                           <div class="form-body">
                           <!-- desc and action -->
                               <div class="row">
@@ -128,7 +121,11 @@ $(function(){
 								   </div>
 								</div>
 							<!-- desc and action -->
-                           <%@include file="/WEB-INF/include/form/stringInfo.jsp" %>
+							<c:forEach items="${regionList}" var="region">
+	                   			<c:if test="${_cfg.functionId eq region.functionId}">
+		                           <%@include file="/WEB-INF/include/form/complexInfo.jsp" %>
+	                   			</c:if>
+	                   		</c:forEach>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
                           </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index ce533d4c3..a90aa07f4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -5,21 +5,21 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 	$(function() {
-		if ($("input[name='action']:checked").val() == 0x20
+		/* if ($("input[name='action']:checked").val() == 0x20
 				|| $("input[name='action']:checked").val() == 0x60) {
 			$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());
 			$("#cfgType").val($("#cfgTypeCallback").val());
 		} else {
 			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
 			$("#cfgType").val($("#cfgTypeMaat").val());
-		}
+		} */
 		$("#cancel").on("click", function() {
 			window.history.back();
 		});
 		$(".action").on("change", function() {
 			$("#serviceId").val($(this).attr("serviceId"));
 			$("#protocolId").val($(this).attr("protocolId"));
-			if ($(this).val() == 0x20 || $(this).val() == 0x60) {
+			/* if ($(this).val() == 0x20 || $(this).val() == 0x60) {
 				$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());
 				$("#cfgType").val($("#cfgTypeCallback").val());
 				$("input[name='isAreaEffective']").each(function() {
@@ -30,7 +30,7 @@
 			} else {
 				$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
 				$("#cfgType").val($("#cfgTypeMaat").val());
-			}
+			} */
 
 		});
 		if ('${fn:length(serviceList)}' > 1) {
@@ -96,15 +96,6 @@
 								<input type="hidden" id="serviceId" name="serviceId"
 									value="${_cfg.serviceId}">
 							</c:if>
-							<!-- 配置域类型 -->
-							<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"
-										value="${region.configRegionCode}">
-								</c:if>
-							</c:forEach>
 							<div class="form-body">
 								<h3 class="form-section">
 									<spring:message code="block_config" />
@@ -150,127 +141,24 @@
 									       </div>
 									   </div>
 								   </c:if>
-									</div>
-									<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="domain_name"/></label>
-										            <div class="col-md-6">
-										            	 <input class="form-control required domainCheck" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
-										            </div>
-										            <div for="cfgKeywords"></div>
-										        </div>
-										    </div>
+								   <c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
 										    <div class="col-md-6">
 										        <div class="form-group">
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="expression_type"/></label>
+										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
 										            <div class="col-md-6">
-										            	<label class="radio-inline hidden">
-										            		<input type="radio" name="exprType" value="1" class="required"
-										            			<c:if test="${_cfg.exprType==1}">checked</c:if>
-										            		><spring:message code="and_expression"/>
-										            	</label>
-										            	<label class="radio-inline">
-										            		<input type="radio" name="exprType" value="0" class="required"
-										            			<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
-										            		><spring:message code="null_expression"/>
-										            	</label>
+										            	<input class="form-control required number" range="[0,100]" type="text" name="ratelimit" value="${_cfg.ratelimit }">
 										            </div>
-										            <div for="exprType"></div>
+										            <div for="ratelimit"></div>
 										        </div>
 										    </div>
-										</div>
-										<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="match_method"/></label>
-										            <div class="col-md-6">
-										            	<select name="matchMethod" class="selectpicker select2 form-control required" >
-															<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																<c:if test="${matchMethodC.itemCode eq 1}">
-																	<option value="${matchMethodC.itemCode}"  selected >
-																	<spring:message code="${matchMethodC.itemValue}"/>
-																	</option>
-																</c:if>
-									               			</c:forEach>     
-														</select>
-										            </div>
-										            <div for="matchMethod"></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_hex"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="1" class="required"
-										            			<c:if test="${_cfg.isHexbin 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.isHexbin ne 1}">checked</c:if>
-										            		><spring:message code="not_hex"/>
-										            	</label>
-										            </div>
-										            <div for="isHex"></div>
-										        </div>
-										    </div>
-	     
-										</div>
-										<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="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.isHexbin==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.isHexbin ne 1}">checked</c:if>
-										            		><spring:message code="case_insenstive"/>
-										            	</label>
-										            </div>
-										            <div for="isCaseInsenstive"></div>
-										        </div>
-										    </div>
-	     
-										</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:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-																<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-									               			</c:forEach>
-														</select>
-										            </div>
-										            <div for="isHexbin"></div>
-										        </div>
-										    </div>
-										</div>
-										<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
-											<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="ratelimit"/></label>
-											            <div class="col-md-6">
-											            	<input class="form-control required number" range="[0,100]" type="text" name="ratelimit">
-											            </div>
-											            <div for="ratelimit"></div>
-											        </div>
-											    </div>
-											</div>
-										</c:if>
+									</c:if>
 									</div>
+								</div>
+								<c:forEach items="${regionList}" var="region">
+		                   			<c:if test="${_cfg.functionId eq region.functionId}">
+			                           <%@include file="/WEB-INF/include/form/complexInfo.jsp" %>
+		                   			</c:if>
+		                   		</c:forEach>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
 								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 3175e1b12..4c54b9877 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -7,12 +7,13 @@
 </head>
 <%-- <c:forEach items="${regionList}" var="regionDistrict">
 	<c:if
-		test="${_cfg.functionId eq regionDistrict.functionId 
+		test="${cfg.functionId eq regionDistrict.functionId 
 		and regionDistrict.regionType eq 3 
 		and regionValue eq regionDistrict.configRegionValue}"> --%>
 		<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
 		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
 		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
+		<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configRegionCode }">
 <%-- 	</c:if>
 </c:forEach> --%>
 
@@ -22,116 +23,221 @@
 			onClick="delContent('${tabName}${status.index}','${tabName}Add');" />
 	</div>
 </div>
-<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="${cfgName}.district"
-					class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
-						<c:forEach items="${fn:split(region.configDistrict,',')}"
-							var="_district">
-							<option value="${_district }"
-								<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
-						</c:forEach>
-				</select>
-				<input type="hidden" name="${cfgName}.districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${complexCfg.district}"/>
+<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="${cfgName}.district"
+						class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
+							<c:forEach items="${fn:split(region.configDistrict,',')}"
+								var="_district">
+								<option value="${_district }"
+									<c:if test="${cfg.district==_district}">selected</c:if>>${_district }</option>
+							</c:forEach>
+					</select>
+					<input type="hidden" name="${cfgName}.districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${cfg.district}"/>
+				</div>
+				<div for="${cfgName}.district"></div>
 			</div>
-			<div for="${cfgName}.district"></div>
 		</div>
 	</div>
+</c:if>
+<div class="row">
+	<c:if test="${isP2pHashCfg}">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
+			<div class="col-md-6">
+				<select name="userRegion2" class="selectpicker show-tick form-control">
+				<option value=""><spring:message code="select"/></option>
+				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
+						<option value="${hashType.itemCode}" <c:if test="${cfg.userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
+				</c:forEach>
+				</select>
+			</div>
+			<div for="userRegion2"></div>
+		</div>
+	</div>
+	</c:if>
 	<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>
-			<div class="col-md-6">
-				<input class="form-control required tags" type="text" id="tags_${tabName}"
-					name="${cfgName}.cfgKeywords"
-					value="${complexCfg.cfgKeywords}">
-			</div>
+			<!-- 此配置的关键词可以输入多个关键词 -->
+			<c:if test="${region.configMultiKeywords eq 1}">
+				<div class="col-md-6">
+					<input class="form-control required tags" type="text" id="tags_${tabName}"
+						name="${cfgName}.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="${cfgName}.cfgKeywords"
+						value="${cfg.cfgKeywords}">
+				</div>
+			</c:if>
+			
 			<div for="${cfgName}.cfgKeywords"></div>
 		</div>
 	</div>
-
+	
 </div>
 <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="expression_type" /></label>
-			<div class="col-md-6">
-				<label class="radio-inline"> <input type="radio"
-					name="${cfgName}.exprType" value="1"
-					class="required"
-					<c:if test="${complexCfg.exprType==1}">checked</c:if>> <spring:message
-						code="and_expression" />
-				</label> <label class="radio-inline"> <input type="radio"
-					name="${cfgName}.exprType" value="0"
-					class="required"
-					<c:if test="${complexCfg.exprType==0 || complexCfg.exprType==null}">checked</c:if>>
-					<spring:message code="null_expression" />
-				</label>
+		<div class="col-md-6">
+			<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,',')}">
+							<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
+								<c:if test="${exprTypeC.itemCode eq exprType}">
+									<label class="radio-inline"> 
+										<input type="radio"
+											name="${cfgName}.exprType" value="${exprType }"
+											class="required"
+											<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="${cfgName}.exprType" value="${exprTypeC.itemCode }"
+											class="required" checked > 
+										<spring:message	code="${exprTypeC.itemValue }" />
+									</label>
+								</c:if>
+							</c:forEach>
+					</c:if>
+				</div>
+				<div for="${cfgName}.exprType"></div>
+				
 			</div>
-			<div for="${cfgName}.exprType"></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="match_method" /></label>
-			<div class="col-md-6">
-				<select name="${cfgName}.matchMethod"
-					class="selectpicker select2 form-control required">
-					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-						<option value="${matchMethodC.itemCode}" <c:if test="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
-					</c:forEach> 
-				</select>
+	
+		<div class="col-md-6">
+			<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="${cfgName}.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="${cfgName}.matchMethod"></div>
 			</div>
-			<div for="${cfgName}.matchMethod"></div>
 		</div>
-	</div>
 </div>
 <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="is_hex"/></label>
-	            <div class="col-md-6">
-	            	<label class="radio-inline">
-	            		<input type="radio" name="${cfgName}.isHex" value="1" class="required"
-	            			<c:if test="${complexCfg.isHexbin eq 1}">checked</c:if>
-	            		><spring:message code="hex"/>
-	            	</label>
-	            	<label class="radio-inline">
-	            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
-	            			<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
-	            		><spring:message code="not_hex"/>
-	            	</label>
-	            </div>
-	            <div for="${cfgName}.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="${cfgName}.isCaseSenstive" value="1" class="required"
-	            			<c:if test="${complexCfg.isHexbin==1}">checked</c:if>
-	            		><spring:message code="case_senstive"/>
-	            	</label>
-	            	<label class="radio-inline">
-	            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
-	            			<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
-	            		><spring:message code="case_insenstive"/>
-	            	</label>
-	            </div>
-	            <div for="${cfgName}.isCaseInsenstive"></div>
-	        </div>
-	    </div>
-	    
-	</div>
+		<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="${cfgName}.isHex" value="1" class="required"
+		            		<c:if test="${isP2pHashCfg}">checked disabled</c:if>
+		            		><spring:message code="hex"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isHex" value="0" class="required"
+		            		<c:if test="${isP2pHashCfg}">disabled</c:if>
+		            		><spring:message code="not_hex"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.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="${cfgName}.isCaseSenstive" value="1" class="required"
+		            		><spring:message code="case_senstive"/>
+		            	</label>
+		            	<label class="radio-inline">
+		            		<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
+		            		><spring:message code="case_insenstive"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.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="${cfgName}.isHex" value="0" class="required" checked
+		            		><spring:message code="not_hex"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.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="${cfgName}.isCaseSenstive" value="0" class="required"
+		            			checked
+		            		><spring:message code="case_insenstive"/>
+		            	</label>
+		            </div>
+		            <div for="${cfgName}.isCaseInsenstive"></div>
+		        </div>
+		    </div>
+	</c:if>
+</div>
 <div class="row hidden">
 	<div class="col-md-6">
 		<div class="form-group">
@@ -140,9 +246,33 @@
 			<div class="col-md-6">
 				<select name="${cfgName}.isHexbin"
 					class="selectpicker select2 form-control required">
-					<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-						<option value="${isHexbinC.itemCode}" <c:if test="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
-					</c:forEach>
+					<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="${cfgName}.isHexbin"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index c2526b226..d9786aa8d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -236,11 +236,11 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.stringList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.stringList}" var="strCfg">
+												<c:forEach items="${_cfg.stringList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq strCfg.cfgType and !isBreak}">
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
 															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
 															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
@@ -249,14 +249,14 @@
 												</c:forEach>
 												<c:if test="${!isBreak}">
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 											</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
index 8a2edc1f3..515937be4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
@@ -188,6 +188,7 @@
 								<c:set var="keywordCfgIndex" value="0"></c:set>
 								<c:set var="subscribeIdCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:set var="isP2pHashCfg" value="${region.configServiceType eq 'p2p_hash'}"></c:set>
 									<c:if test="${region.regionType eq 1 }">
 										<!--ip info-->
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
@@ -235,11 +236,11 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.p2pHashList)>0 and (!empty _cfg.p2pHashList[hashCfgIndex].cfgId)}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.p2pHashList}" var="strCfg">
+												<c:forEach items="${_cfg.p2pHashList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq strCfg.cfgType and !isBreak}">
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
 															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
 															<c:set var="hashCfgIndex" value="${hashCfgIndex+1 }"></c:set>
@@ -248,14 +249,14 @@
 												</c:forEach>
 												<c:if test="${!isBreak}">
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="hashCfgIndex" value="${hashCfgIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="hashCfgIndex" value="${hashCfgIndex+1 }"></c:set>
 											</c:otherwise>
@@ -275,11 +276,11 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.p2pKeywordList)>0 and (!empty _cfg.p2pKeywordList[keywordCfgIndex].cfgId)}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.p2pKeywordList}" var="strCfg">
+												<c:forEach items="${_cfg.p2pKeywordList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq strCfg.cfgType and !isBreak}">
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
 															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
 															<c:set var="keywordCfgIndex" value="${keywordCfgIndex+1 }"></c:set>
@@ -288,14 +289,14 @@
 												</c:forEach>
 												<c:if test="${!isBreak}">
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="keywordCfgIndex" value="${keywordCfgIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="keywordCfgIndex" value="${keywordCfgIndex+1 }"></c:set>
 											</c:otherwise>
@@ -315,11 +316,11 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0 and (!empty _cfg.ntcSubscribeIdCfgList[subscribeIdCfgIndex].cfgId)}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="strCfg">
+												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq strCfg.cfgType and !isBreak}">
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
 															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
 															<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
@@ -328,14 +329,14 @@
 												</c:forEach>
 												<c:if test="${!isBreak}">
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="subscribeIdCfgIndex" value="${subscribeIdCfgIndex+1 }"></c:set>
 											</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
index cf76889c5..cde6ebb7f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -243,7 +243,7 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.complexList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.complexList}" var="complexCfg">
+												<c:forEach items="${_cfg.complexList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionCode eq complexCfg.cfgRegionCode and !isBreak}">
 															<div class="row boxSolid ${tabName}${status.index}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 4990b79ab..2d5875a6c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -231,9 +231,9 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.domainList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.domainList}" var="complexCfg">
+												<c:forEach items="${_cfg.domainList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq complexCfg.cfgType and !isBreak}">
+														<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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 2f6acf5b4..b1b136fee 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -225,9 +225,9 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.domainList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.domainList}" var="complexCfg">
+												<c:forEach items="${_cfg.domainList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq complexCfg.cfgType and !isBreak}">
+														<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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
index a753d8eb0..3be799c7d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
@@ -233,12 +233,12 @@
 												</h4>
 												
 												<%-- <c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set> --%>
-												<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
+												<c:forEach items="${_cfg.httpUrlList}" var="cfg"
 												varStatus="status">
 													<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
 													<div class="row boxSolid ${tabName}${status.index} 
-													<c:if test="${empty strCfg.cfgId}">hidden disabled </c:if>" >
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 												</c:forEach>
 											</div>
@@ -256,11 +256,11 @@
 												</h4>
 												
 												<%-- <c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set> --%>
-												<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
+												<c:forEach items="${_cfg.httpReqBodyList}" var="cfg"
 												varStatus="status">
 													<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
-													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled </c:if>" >
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 												</c:forEach>
 											</div>
@@ -278,11 +278,11 @@
 												</h4>
 												
 												<%-- <c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set> --%>
-												<c:forEach items="${_cfg.httpResBodyList}" var="strCfg"
+												<c:forEach items="${_cfg.httpResBodyList}" var="cfg"
 												varStatus="status">
 													<c:set var="cfgName" value="httpResBodyList[${status.index}]"></c:set>
-													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled </c:if>" >
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 												</c:forEach>
 											</div>
@@ -301,10 +301,10 @@
 												</h4>
 												
 												<%-- <c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set> --%>
-												<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
+												<c:forEach items="${_cfg.httpReqHdrList}" var="cfg"
 													varStatus="status">
 													<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
-													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty complexCfg.cfgId}">hidden disabled </c:if>">
+													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 												</c:forEach>
@@ -322,10 +322,10 @@
 													onClick="addContent(this,'${tabName}')" title="add"></span></small>
 												</h4>
 												<%-- <c:set var="regionValue" value="${_cfg.httpResHdr.cfgType}"></c:set> --%>
-												<c:forEach items="${_cfg.httpResHdrList}" var="complexCfg"
+												<c:forEach items="${_cfg.httpResHdrList}" var="cfg"
 													varStatus="status">
 													<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
-													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty complexCfg.cfgId}">hidden disabled </c:if>">
+													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>">
 
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 506c51e09..9c671aea2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -26,22 +26,6 @@ $(function(){
 	</div>
 </div>
 <div class="row">
-	<c:if test="${region.configRegionValue eq 'NTC_P2P_HASH_BIN'}">
-	<div class="col-md-6">
-		<div class="form-group">
-			<label class="control-label col-md-3"><spring:message code="p2p_hash_type"/></label>
-			<div class="col-md-6">
-				<select name="userRegion2" class="selectpicker show-tick form-control">
-				<option value=""><spring:message code="select"/></option>
-				<c:forEach items="${fns:getDictList('P2P_HASH_TYPE')}" var="hashType">
-						<option value="${hashType.itemCode}" <c:if test="${_cfg.p2pHashList[0].userRegion1==hashType.itemCode}">selected</c:if> ><spring:message code="${hashType.itemValue}"/></option>
-				</c:forEach>
-				</select>
-			</div>
-			<div for="userRegion2"></div>
-		</div>
-	</div>
-	</c:if>
 	<div class="col-md-6">
 		<div class="form-group">
 			<label class="control-label col-md-3"><font color="red">*</font>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index 6026e6c16..138478671 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -252,9 +252,9 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.domainList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.domainList}" var="complexCfg">
+												<c:forEach items="${_cfg.domainList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq complexCfg.cfgType and !isBreak}">
+														<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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
index 2688174e7..75400e84b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -294,12 +294,12 @@
 																	</h4>
 																	
 																	<%-- <c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set> --%>
-																	<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
+																	<c:forEach items="${_cfg.httpUrlList}" var="cfg"
 																	varStatus="status">
 																		<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
 																		<div class="row boxSolid ${tabName}${status.index} 
-																		<c:if test="${empty strCfg.cfgId}">hidden disabled </c:if>" >
-																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																		<c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
 																	</c:forEach>
 																</div>
@@ -317,11 +317,11 @@
 																	</h4>
 																	
 																	<%-- <c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set> --%>
-																	<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
+																	<c:forEach items="${_cfg.httpReqBodyList}" var="cfg"
 																	varStatus="status">
 																		<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
-																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled </c:if>" >
-																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
 																	</c:forEach>
 																</div>
@@ -339,11 +339,11 @@
 																	</h4>
 																	
 																	<%-- <c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set> --%>
-																	<c:forEach items="${_cfg.httpResBodyList}" var="strCfg"
+																	<c:forEach items="${_cfg.httpResBodyList}" var="cfg"
 																	varStatus="status">
 																		<c:set var="cfgName" value="httpResBodyList[${status.index}]"></c:set>
-																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty strCfg.cfgId}">hidden disabled </c:if>" >
-																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
 																	</c:forEach>
 																</div>
@@ -362,10 +362,10 @@
 																	</h4>
 																	
 																	<%-- <c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set> --%>
-																	<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
+																	<c:forEach items="${_cfg.httpReqHdrList}" var="cfg"
 																		varStatus="status">
 																		<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
-																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty complexCfg.cfgId}">hidden disabled </c:if>">
+																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>">
 																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
 																	</c:forEach>
@@ -383,10 +383,10 @@
 																		onClick="addContent(this,'${tabName}')" title="add"></span></small>
 																	</h4>
 																	<%-- <c:set var="regionValue" value="${_cfg.httpResHdr.cfgType}"></c:set> --%>
-																	<c:forEach items="${_cfg.httpResHdrList}" var="complexCfg"
+																	<c:forEach items="${_cfg.httpResHdrList}" var="cfg"
 																		varStatus="status">
 																		<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
-																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty complexCfg.cfgId}">hidden disabled </c:if>">
+																		<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>">
 	
 																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 																		</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index a1bc966cd..187c5374c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -236,11 +236,11 @@
 										<c:choose>
 											<c:when test="${fn:length(_cfg.sslList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.sslList}" var="strCfg">
+												<c:forEach items="${_cfg.sslList}" var="cfg">
 													<c:choose>
-														<c:when test="${region.configRegionValue eq strCfg.cfgType and !isBreak}">
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
 															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
 															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
@@ -249,14 +249,14 @@
 												</c:forEach>
 												<c:if test="${!isBreak}">
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
 											</c:otherwise>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 8317b2805..97b704ff4 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,11 +1,11 @@
 $(function(){
-	$("input[name$='isHex']").on("change",function(){
-	   setIsHexBin(this);
-	});
-	$("input[name$='isCaseSenstive']").on("change",function(){
+	$("select[name$='isHexbin']").each(function(){
 		setIsHexBin(this);
 	});
-	$("input[name$='isHex']:checked").each(function(){
+	$("input[name$='isHex']").on("change",function(){
+		setIsHexBin(this);
+	});
+	$("input[name$='isCaseSenstive']").on("change",function(){
 		setIsHexBin(this);
 	});
 	$("a[name=viewLogInfo]>i").on("click",function(){
@@ -449,8 +449,27 @@ var setIsHexBin=function(obj){
 	if($(obj).attr("name").indexOf(".") > -1){
 		profix=$(obj).attr("name").substring(0,$(obj).attr("name").indexOf(".")+1);
 	}
-	console.log($(obj).attr("name"));
-	console.log(profix);
+	if($(obj).attr("name").indexOf("isHexbin") > -1){
+		var isHexbin=$(obj).val();
+		if(isHexbin == 0){
+			$("input[name='"+profix+"isHex'][value=0]").prop("checked",true);
+			$("input[name='"+profix+"isHex'][value=1]").prop("checked",false);
+			$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",true);
+			$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",false);
+		}else if(isHexbin == 1){
+			$("input[name='"+profix+"isHex'][value=1]").prop("checked",true);
+			$("input[name='"+profix+"isHex'][value=0]").prop("checked",false);
+			$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",true);
+			$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",false);
+			$("input[name='"+profix+"isCaseSenstive'][value=1]").parent().addClass("hidden");
+		}else if(isHexbin == 2){
+			$("input[name='"+profix+"isHex'][value=0]").prop("checked",true);
+			$("input[name='"+profix+"isHex'][value=1]").prop("checked",false);
+			$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",true);
+			$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",false);
+		}
+		return;
+	}
 	var isHex=$("input[name='"+profix+"isHex']:checked").val();
 	//如果选择十六进制，则必须发小写不敏感
 	if(isHex == 1){