From 59202b6d29c0b0e09b50f6f6c59083e66a8e76c2 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Wed, 6 Jun 2018 09:57:26 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=A4=9A=E5=9F=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=E9=85=8D=E7=BD=AE=E5=9F=9F=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=A4=9A=E5=B1=82=E5=BE=AA=E7=8E=AF=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2、修改配置列表的区域管控信息查询

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 .../messages/message_zh_CN.properties         |   1 +
 src/main/webapp/WEB-INF/include/header.jsp    |   2 +-
 .../WEB-INF/views/cfg/complexCfgForm.jsp      |  27 +-
 .../WEB-INF/views/cfg/digestCfgForm.jsp       |  16 +-
 .../views/cfg/fileTransfer/ftpForm.jsp        |   5 +-
 .../views/cfg/fileTransfer/ftpList.jsp        |   4 +-
 .../webapp/WEB-INF/views/cfg/ipCfgForm.jsp    |  12 +-
 .../WEB-INF/views/cfg/mail/mailForm.jsp       |   7 +-
 .../WEB-INF/views/cfg/mail/mailList.jsp       |   2 +-
 .../WEB-INF/views/cfg/stringCfgForm.jsp       |  12 +-
 .../WEB-INF/views/cfg/website/dnsForm.jsp     |   5 +-
 .../WEB-INF/views/cfg/website/dnsList.jsp     |   2 +-
 .../WEB-INF/views/cfg/website/httpForm.jsp    | 299 ++++++++----------
 .../WEB-INF/views/cfg/website/httpList.jsp    |   2 +-
 .../WEB-INF/views/cfg/website/sslForm.jsp     |   5 +-
 .../WEB-INF/views/cfg/website/sslList.jsp     |   2 +-
 .../webapp/static/global/scripts/common.js    |   2 +-
 17 files changed, 191 insertions(+), 214 deletions(-)

diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 5f4827eac..ce98b65a4 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -592,3 +592,4 @@ dns_domain=DNS\u57DF\u540D\u914D\u7F6E
 has_prohibit_delete=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u5220\u9664
 has_prohibit_nopass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u672A\u901A\u8FC7\u5BA1\u6838
 has_prohibit_pass=\u53EA\u6709\u672A\u5BA1\u6838\u7684\u914D\u7F6E\u53EF\u4EE5\u5BA1\u6838\u901A\u8FC7
+multiple_keywords_tip=\u53EF\u540C\u65F6\u8F93\u5165\u591A\u6761\u5173\u952E\u5B57\uFF0C\u8BF7\u4EE5\u82F1\u6587\u9017\u53F7\u6216\u8005\u56DE\u8F66\u952E\u9694\u5F00\u3002
diff --git a/src/main/webapp/WEB-INF/include/header.jsp b/src/main/webapp/WEB-INF/include/header.jsp
index 6122a94df..eb3e9262d 100644
--- a/src/main/webapp/WEB-INF/include/header.jsp
+++ b/src/main/webapp/WEB-INF/include/header.jsp
@@ -87,4 +87,4 @@
 </c:choose>
 <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>
+<script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
index 77db266ac..e64867f91 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
@@ -5,16 +5,16 @@
 <title></title>
 
 </head>
-<c:forEach items="${regionList}" var="regionDistrict">
+<%-- <c:forEach items="${regionList}" var="regionDistrict">
 	<c:if
 		test="${_cfg.functionId eq regionDistrict.functionId 
 		and regionDistrict.regionType eq 3 
-		and regionValue eq regionDistrict.configRegionValue}">
+		and regionValue eq regionDistrict.configRegionValue}"> --%>
 		<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
-		<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
-	</c:if>
-</c:forEach>
+		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
+<%-- 	</c:if>
+</c:forEach> --%>
 
 <div class="row">
 	<div class="pull-right">
@@ -30,16 +30,11 @@
 			<div class="col-md-6">
 				<select name="${cfgName}.district"
 					class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
-					<c:forEach items="${regionList}" var="regionDistrict">
-						<c:if
-							test="${_cfg.functionId eq regionDistrict.functionId and regionValue eq regionDistrict.configRegionValue}">
-							<c:forEach items="${fn:split(regionDistrict.configDistrict,',')}"
-								var="_district">
-								<option value="${_district }"
-									<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
-							</c:forEach>
-						</c:if>
-					</c:forEach>
+						<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}"/>
 			</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp
index 87c287277..7ab47a57b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp
@@ -5,16 +5,16 @@
 <title></title>
 
 </head>
-<c:forEach items="${regionList}" var="regionDistrict">
-	<c:if
+	<%-- <c:forEach items="${regionList}" var="regionDistrict">
+		<c:if
 		test="${_cfg.functionId eq regionDistrict.functionId 
 		and regionDistrict.regionType eq 5 
-		and regionValue eq regionDistrict.configRegionValue}">
+		and regionValue eq regionDistrict.configRegionValue}"> --%>
 		<!-- regionDistrict.regionType==5表示文件摘要类配置 -->
-		<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
-	</c:if>
-</c:forEach>
+		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
+	<%-- </c:if>
+</c:forEach> --%>
 
 <div class="row">
 	<div class="pull-right">
@@ -40,7 +40,7 @@
 				   </div>
            	 	   <input id="rawLen" name="rawLen" type="hidden" value="${digestCfg.rawLen }"/>
 			</div>
-			<div for="${cfgName}.file"></div>
+			<div for="fileInfo"></div>
 		</div>
 	</div>
 	<div class="col-md-6">
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 08b160310..10a96ceef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -106,6 +106,7 @@
 </head>
 <body>
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
 		<div class="row">
 			<div class="col-md-12">
@@ -181,7 +182,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
 												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
@@ -211,7 +212,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="stringList[${strCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.stringList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index aa14f5812..980aaba1c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -339,8 +339,8 @@
 									</td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isAreaEffective==1}">
-												<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="yes"/>
 												</a>
 										</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
index 0c4e70d0d..893750004 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
@@ -9,14 +9,14 @@ $(function(){
 });
 </script>
 </head>
-<c:forEach items="${regionList}" var="regionDistrict">
+<%-- <c:forEach items="${regionList}" var="regionDistrict">
 	<c:if
-		test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}">
+		test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}"> --%>
 		<!-- regionDistrict.regionType==1表示IP类配置 -->
-		<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
-	</c:if>
-</c:forEach>
+		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
+	<%-- </c:if>
+</c:forEach> --%>
 <input type="hidden" name="${cfgName}.protocolId" id="protocolId" value="">
 <div class="row">
 	<div class="pull-right">
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 be2ecca1a..4fbd92ca3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -112,6 +112,7 @@
 </head>
 <body>
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
 		<div class="row">
 			<div class="col-md-12">
@@ -188,7 +189,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
 												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
@@ -218,7 +219,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="complexList[${complexCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.complexList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
@@ -257,7 +258,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="digestList[${digestCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.digestList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index d65a0da10..fc615d31b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -340,7 +340,7 @@
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
-												<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="yes"/>
 												</a>
 										</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
index 627641ebc..b21abaa57 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
@@ -9,16 +9,16 @@ $(function(){
 });
 </script>
 </head>
-<c:forEach items="${regionList}" var="regionDistrict">
+<%-- <c:forEach items="${regionList}" var="regionDistrict">
 	<c:if
 		test="${strCfg.functionId eq regionDistrict.functionId 
 		and regionDistrict.regionType eq 2 
-		and regionValue eq regionDistrict.configRegionValue}">
+		and regionValue eq regionDistrict.configRegionValue}"> --%>
 		<!-- regionDistrict.regionType==2表示字符串类配置 -->
-		<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
-	</c:if>
-</c:forEach>
+		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
+	<%-- </c:if>
+</c:forEach> --%>
 <div class="row">
 	<div class="pull-right">
 		<span class="glyphicon glyphicon-remove pull-right" title="remove"
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 d26ca1476..27af45f17 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -106,6 +106,7 @@
 </head>
 <body>
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
 		<div class="row">
 			<div class="col-md-12">
@@ -181,7 +182,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
 												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
@@ -211,7 +212,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="domainList[${complexCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.domainList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index a49975fed..5c6088b0f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -339,7 +339,7 @@
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
-												<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="yes"/>
 												</a>
 										</c:if>
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 f835a86a3..46d92033b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -127,6 +127,7 @@
 </head>
 <body>
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
 		<div class="row">
 			<div class="col-md-12">
@@ -209,168 +210,144 @@
 															</div>
 														</div>
 													</div>
+													<c:forEach items="${regionList}" var="region" varStatus="status">
+														<c:if test="${region.regionType eq 1 }">
+															<!--ip info-->
+															<div class="httpReqCfg">
+																<c:set var="tabName" value="httpIpTab"></c:set>
+																<h4 class="form-section" >
+																	<spring:message code="http_ip_title" />
+																	<small> <span
+																		class="glyphicon glyphicon-plus  ${tabName}Add"
+																		onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																</h4>
+																
+																<c:forEach items="${_cfg.ipPortList}" var="ipPort"
+																	varStatus="status">
+																	<c:set var="cfgName" value="ipPortList[${status.index}]"></c:set>
+																	<div class="row boxSolid ${tabName}${status.index}" >
+																		 <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+																	</div>
+																	<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>
+																</c:forEach>
+															</div>
+															<!--/ip info-->
+														</c:if>
 													
-													<!--url info-->
-													<div class="httpReqCfg">
-														<c:set var="tabName" value="httpUrlTab"></c:set>
-														<h4 class="form-section" >
-															<spring:message code="http_url_title" />
-															<small> <span
-																class="glyphicon glyphicon-plus ${tabName}Add"
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
-														</h4>
-														
-														<c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set>
-														<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
-														varStatus="status">
-															<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
-															<div class="row boxSolid ${tabName}${status.index} " >
-																<!-- 引入页面动态传参 -->
-																<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
-																	<jsp:param value="http_url" name="regionValue"/>
-																	<jsp:param value="httpUrl" name="cfgName"/>
-																	<jsp:param value="httpUrl${status.index }" name="cfgNameIndex"/>
-																	<jsp:param value="httpUrlList[${status.index }]" name="propertiesName"/>
-																</jsp:include> --%>
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
-															</div>
-														</c:forEach>
-													</div>
-													<!--/url info-->
-													<!--request header info-->
-													<div class="httpReqCfg">
-														<c:set var="tabName" value="httpReqHdrTab"></c:set>
-														<h4 class="form-section" >
-															<spring:message code="http_req_hdr_title" />
-															<small> <span
-																class="glyphicon glyphicon-plus  ${tabName}Add"
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
-														</h4>
-														
-														<c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set>
-														<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
-															varStatus="status">
-															<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
-															<div class="row boxSolid ${tabName}${status.index} ">
-																<!-- 引入页面动态传参 -->
-																<%-- <jsp:include page="/WEB-INF/views/cfg/complexCfgForm.jsp" flush="true">
-																	<jsp:param value="http_req_hdr" name="regionValue"/>
-																	<jsp:param value="httpReqHdr" name="cfgName"/>
-																	<jsp:param value="httpReqHdr${status.index }" name="cfgNameIndex"/>
-																	<jsp:param value="httpReqHdrList[${status.index }]" name="propertiesName"/>
-																</jsp:include> --%>
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															</div>
-														</c:forEach>
-													</div>
-													<!--/request header info-->
-													<!--request body info-->
-													<div class="httpReqCfg">
-														<c:set var="tabName" value="httpReqBodyTab"></c:set>
-														<h4 class="form-section" >
-															<spring:message code="http_req_body_title" />
-															<small> <span
-																class="glyphicon glyphicon-plus  ${tabName}Add"
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
-														</h4>
-														
-														<c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set>
-														<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
-														varStatus="status">
-															<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
-															<div class="row boxSolid ${tabName}${status.index} " >
-																<!-- 引入页面动态传参 -->
-																<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
-																	<jsp:param value="http_req_body" name="regionValue"/>
-																	<jsp:param value="httpReqBody" name="cfgName"/>
-																	<jsp:param value="httpReqBody${status.index }" name="cfgNameIndex"/>
-																	<jsp:param value="httpReqBodyList[${status.index }]" name="propertiesName"/>
-																</jsp:include> --%>
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
-															</div>
-														</c:forEach>
-													</div>
-													<!--/request body info-->
-													<!--response header info-->
-													<div class="httpResCfg">
-														<c:set var="tabName" value="httpResHdrTab"></c:set>
-														<h4 class="form-section" >
-															<spring:message code="http_res_hdr_title" />
-															<small> <span
-															class="glyphicon glyphicon-plus  ${tabName}Add"
-															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"
-															varStatus="status">
-															<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
-															<div class="row boxSolid ${tabName}${status.index} ">
-																<%-- <jsp:include page="/WEB-INF/views/cfg/complexCfgForm.jsp" flush="true">
-																	<jsp:param value="http_res_hdr" name="regionValue"/>
-																	<jsp:param value="httpResHdr" name="cfgName"/>
-																	<jsp:param value="httpResHdr${status.index }" name="cfgNameIndex"/>
-																	<jsp:param value="httpResHdrList[${status.index }]" name="propertiesName"/>
-																</jsp:include> --%>
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															</div>
-														</c:forEach>
-													</div>
-													<!--/response header info-->
-													<!--response body info-->
-													<div class="httpResCfg">
-														<c:set var="tabName" value="httpResBodyTab"></c:set>
-														<h4 class="form-section" >
-															<spring:message code="http_res_body_title" />
-															<small> <span
-																class="glyphicon glyphicon-plus ${tabName}Add"
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
-														</h4>
-														
-														<c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set>
-														<c:forEach items="${_cfg.httpResBodyList}" var="strCfg"
-														varStatus="status">
-															<c:set var="cfgName" value="httpResBodyList[${status.index}]"></c:set>
-															<div class="row boxSolid ${tabName}${status.index} " >
-																<!-- 引入页面动态传参 -->
-																<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
-																	<jsp:param value="http_res_body" name="regionValue"/>
-																	<jsp:param value="httpResBody" name="cfgName"/>
-																	<jsp:param value="httpResBody${status.index }" name="cfgNameIndex"/>
-																	<jsp:param value="httpResBodyList[${status.index }]" name="propertiesName"/>
-																</jsp:include> --%>
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
-															</div>
-														</c:forEach>
-													</div>
-													<!--ip info-->
-													<div class="httpReqCfg">
-														<c:set var="tabName" value="httpIpTab"></c:set>
-														<h4 class="form-section" >
-															<spring:message code="http_ip_title" />
-															<small> <span
-																class="glyphicon glyphicon-plus  ${tabName}Add"
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
-														</h4>
-														
-														<c:forEach items="${_cfg.ipPortList}" var="ipPort"
-															varStatus="status">
-															<c:set var="cfgName" value="ipPortList[${status.index}]"></c:set>
-															<div class="row boxSolid ${tabName}${status.index}" >
-															
-																<!-- 引入页面动态传参 -->
-																<%-- <jsp:include page="/WEB-INF/views/cfg/ipCfgForm.jsp" flush="true">
-																	<jsp:param value="ipCfg" name="cfgName"/>
-																	<jsp:param value="ipCfg${status.index }" name="cfgNameIndex"/>
-																	<jsp:param value="ipPortList[${status.index }]" name="propertiesName"/>
-																</jsp:include> --%>
-																 <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
-															</div>
-															<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>
-														</c:forEach>
-													</div>
-													<!--/ip info-->
-													<br>
+														<c:if test="${region.regionType eq 2 }">
+															<c:if test="${region.configRegionValue eq 'http_url' }">
+																<!--url info-->
+																<div class="httpReqCfg">
+																	<c:set var="tabName" value="httpUrlTab"></c:set>
+																	<h4 class="form-section" >
+																		<spring:message code="http_url_title" />
+																		<small> <span
+																			class="glyphicon glyphicon-plus ${tabName}Add"
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																	</h4>
+																	
+																	<%-- <c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set> --%>
+																	<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
+																	varStatus="status">
+																		<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index} " >
+																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																		</div>
+																	</c:forEach>
+																</div>
+																<!--/url info-->
+															</c:if>
+															<c:if test="${region.configRegionValue eq 'http_req_body' }">
+																<!--request body info-->
+																<div class="httpReqCfg">
+																	<c:set var="tabName" value="httpReqBodyTab"></c:set>
+																	<h4 class="form-section" >
+																		<spring:message code="http_req_body_title" />
+																		<small> <span
+																			class="glyphicon glyphicon-plus  ${tabName}Add"
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																	</h4>
+																	
+																	<%-- <c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set> --%>
+																	<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
+																	varStatus="status">
+																		<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index} " >
+																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																		</div>
+																	</c:forEach>
+																</div>
+																<!--/request body info-->
+															</c:if>
+															<c:if test="${region.configRegionValue eq 'http_res_body' }">
+																<!--response body info-->
+																<div class="httpResCfg">
+																	<c:set var="tabName" value="httpResBodyTab"></c:set>
+																	<h4 class="form-section" >
+																		<spring:message code="http_res_body_title" />
+																		<small> <span
+																			class="glyphicon glyphicon-plus ${tabName}Add"
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																	</h4>
+																	
+																	<%-- <c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set> --%>
+																	<c:forEach items="${_cfg.httpResBodyList}" var="strCfg"
+																	varStatus="status">
+																		<c:set var="cfgName" value="httpResBodyList[${status.index}]"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index} " >
+																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																		</div>
+																	</c:forEach>
+																</div>
+															</c:if>
+														</c:if>
+														<c:if test="${region.regionType eq 3 }">
+															<c:if test="${region.configRegionValue eq 'http_req_hdr' }">
+																<!--request header info-->
+																<div class="httpReqCfg">
+																	<c:set var="tabName" value="httpReqHdrTab"></c:set>
+																	<h4 class="form-section" >
+																		<spring:message code="http_req_hdr_title" />
+																		<small> <span
+																			class="glyphicon glyphicon-plus  ${tabName}Add"
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																	</h4>
+																	
+																	<%-- <c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set> --%>
+																	<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
+																		varStatus="status">
+																		<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index} ">
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																		</div>
+																	</c:forEach>
+																</div>
+																<!--/request header info-->
+															</c:if>
+															<c:if test="${region.configRegionValue eq 'http_res_hdr' }">
+																<!--response header info-->
+																<div class="httpResCfg">
+																	<c:set var="tabName" value="httpResHdrTab"></c:set>
+																	<h4 class="form-section" >
+																		<spring:message code="http_res_hdr_title" />
+																		<small> <span
+																		class="glyphicon glyphicon-plus  ${tabName}Add"
+																		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"
+																		varStatus="status">
+																		<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index} ">
+	
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																		</div>
+																	</c:forEach>
+																</div>
+																<!--/response header info-->
+															</c:if>
+														</c:if>
+													</c:forEach>
 													<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
 													<br>
 													<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index d96af87be..741ebb25a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -340,7 +340,7 @@
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
-												<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="yes"/>
 												</a>
 										</c:if>
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 47ca023e4..f3211c11e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -97,6 +97,7 @@
 </head>
 <body>
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
+	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
 		<div class="row">
 			<div class="col-md-12">
@@ -172,7 +173,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
 												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
@@ -202,7 +203,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
-										<c:set var="regionValue" value="${region.configRegionValue}"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.sslList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 0ffc2f29d..1c8d1dbf4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -339,7 +339,7 @@
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">
-												<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
 													<spring:message code="yes"/>
 												</a>
 										</c:if>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 8829ea0ba..20be3dae3 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -242,7 +242,7 @@ $(function(){
 		trigger:"hover",
 		title:"",
 		content:function(){
-			var content = "可同时输入多条关键字，请以英文逗号或者回车键隔开。";
+			var content = $("#tagsinputTip").text();
 		    return content;
 		}
 	});