1、修改多域配置表单逻辑，删除修改不必要的功能配置域字典多层循环判断；

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

Signed-off-by: zhangwei <zhangwei@intranet.com>

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

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>

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}.cfgType" value="${region.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
-	</c:if>
+<%-- 	</c:if>
-</c:forEach>
+</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:forEach items="${fn:split(region.configDistrict,',')}"
-						<c:if
+							var="_district">
-							test="${_cfg.functionId eq regionDistrict.functionId and regionValue eq regionDistrict.configRegionValue}">
+							<option value="${_district }"
-							<c:forEach items="${fn:split(regionDistrict.configDistrict,',')}"
+								<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
-								var="_district">
+						</c:forEach>
-								<option value="${_district }"
-									<c:if test="${complexCfg.district==_district}">selected</c:if>>${_district }</option>
-							</c:forEach>
-						</c:if>
-					</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>

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

@@ -5,16 +5,16 @@
 <title></title>
 
 </head>
-<c:forEach items="${regionList}" var="regionDistrict">
+	<%-- <c:forEach items="${regionList}" var="regionDistrict">
-	<c:if
+		<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}.cfgType" value="${region.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
-	</c:if>
+	<%-- </c:if>
-</c:forEach>
+</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">

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>

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}">
+										<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>

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}.cfgType" value="${region.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
-	</c:if>
+	<%-- </c:if>
-</c:forEach>
+</c:forEach> --%>
 <input type="hidden" name="${cfgName}.protocolId" id="protocolId" value="">
 <div class="row">
 	<div class="pull-right">

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>

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>

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}.cfgType" value="${region.configRegionValue }">
-		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }">
-	</c:if>
+	<%-- </c:if>
-</c:forEach>
+</c:forEach> --%>
 <div class="row">
 	<div class="pull-right">
 		<span class="glyphicon glyphicon-remove pull-right" title="remove"

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>

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>

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-->
+														<c:if test="${region.regionType eq 2 }">
-													<div class="httpReqCfg">
+															<c:if test="${region.configRegionValue eq 'http_url' }">
-														<c:set var="tabName" value="httpUrlTab"></c:set>
+																<!--url info-->
-														<h4 class="form-section" >
+																<div class="httpReqCfg">
-															<spring:message code="http_url_title" />
+																	<c:set var="tabName" value="httpUrlTab"></c:set>
-															<small> <span
+																	<h4 class="form-section" >
-																class="glyphicon glyphicon-plus ${tabName}Add"
+																		<spring:message code="http_url_title" />
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																		<small> <span
-														</h4>
+																			class="glyphicon glyphicon-plus ${tabName}Add"
-														
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
-														<c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set>
+																	</h4>
-														<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
+																	
-														varStatus="status">
+																	<%-- <c:set var="regionValue" value="${_cfg.httpUrl.cfgType}"></c:set> --%>
-															<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
+																	<c:forEach items="${_cfg.httpUrlList}" var="strCfg"
-															<div class="row boxSolid ${tabName}${status.index} " >
+																	varStatus="status">
-																<!-- 引入页面动态传参 -->
+																		<c:set var="cfgName" value="httpUrlList[${status.index}]"></c:set>
-																<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
+																		<div class="row boxSolid ${tabName}${status.index} " >
-																	<jsp:param value="http_url" name="regionValue"/>
+																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
-																	<jsp:param value="httpUrl" name="cfgName"/>
+																		</div>
-																	<jsp:param value="httpUrl${status.index }" name="cfgNameIndex"/>
+																	</c:forEach>
-																	<jsp:param value="httpUrlList[${status.index }]" name="propertiesName"/>
+																</div>
-																</jsp:include> --%>
+																<!--/url info-->
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+															</c:if>
-															</div>
+															<c:if test="${region.configRegionValue eq 'http_req_body' }">
-														</c:forEach>
+																<!--request body info-->
-													</div>
+																<div class="httpReqCfg">
-													<!--/url info-->
+																	<c:set var="tabName" value="httpReqBodyTab"></c:set>
-													<!--request header info-->
+																	<h4 class="form-section" >
-													<div class="httpReqCfg">
+																		<spring:message code="http_req_body_title" />
-														<c:set var="tabName" value="httpReqHdrTab"></c:set>
+																		<small> <span
-														<h4 class="form-section" >
+																			class="glyphicon glyphicon-plus  ${tabName}Add"
-															<spring:message code="http_req_hdr_title" />
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
-															<small> <span
+																	</h4>
-																class="glyphicon glyphicon-plus  ${tabName}Add"
+																	
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																	<%-- <c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set> --%>
-														</h4>
+																	<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
-														
+																	varStatus="status">
-														<c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set>
+																		<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
-														<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
+																		<div class="row boxSolid ${tabName}${status.index} " >
-															varStatus="status">
+																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
-															<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
+																		</div>
-															<div class="row boxSolid ${tabName}${status.index} ">
+																	</c:forEach>
-																<!-- 引入页面动态传参 -->
+																</div>
-																<%-- <jsp:include page="/WEB-INF/views/cfg/complexCfgForm.jsp" flush="true">
+																<!--/request body info-->
-																	<jsp:param value="http_req_hdr" name="regionValue"/>
+															</c:if>
-																	<jsp:param value="httpReqHdr" name="cfgName"/>
+															<c:if test="${region.configRegionValue eq 'http_res_body' }">
-																	<jsp:param value="httpReqHdr${status.index }" name="cfgNameIndex"/>
+																<!--response body info-->
-																	<jsp:param value="httpReqHdrList[${status.index }]" name="propertiesName"/>
+																<div class="httpResCfg">
-																</jsp:include> --%>
+																	<c:set var="tabName" value="httpResBodyTab"></c:set>
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																	<h4 class="form-section" >
-															</div>
+																		<spring:message code="http_res_body_title" />
-														</c:forEach>
+																		<small> <span
-													</div>
+																			class="glyphicon glyphicon-plus ${tabName}Add"
-													<!--/request header info-->
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
-													<!--request body info-->
+																	</h4>
-													<div class="httpReqCfg">
+																	
-														<c:set var="tabName" value="httpReqBodyTab"></c:set>
+																	<%-- <c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set> --%>
-														<h4 class="form-section" >
+																	<c:forEach items="${_cfg.httpResBodyList}" var="strCfg"
-															<spring:message code="http_req_body_title" />
+																	varStatus="status">
-															<small> <span
+																		<c:set var="cfgName" value="httpResBodyList[${status.index}]"></c:set>
-																class="glyphicon glyphicon-plus  ${tabName}Add"
+																		<div class="row boxSolid ${tabName}${status.index} " >
-																onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																			<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
-														</h4>
+																		</div>
-														
+																	</c:forEach>
-														<c:set var="regionValue" value="${_cfg.httpReqBody.cfgType}"></c:set>
+																</div>
-														<c:forEach items="${_cfg.httpReqBodyList}" var="strCfg"
+															</c:if>
-														varStatus="status">
+														</c:if>
-															<c:set var="cfgName" value="httpReqBodyList[${status.index}]"></c:set>
+														<c:if test="${region.regionType eq 3 }">
-															<div class="row boxSolid ${tabName}${status.index} " >
+															<c:if test="${region.configRegionValue eq 'http_req_hdr' }">
-																<!-- 引入页面动态传参 -->
+																<!--request header info-->
-																<%-- <jsp:include page="/WEB-INF/views/cfg/stringCfgForm.jsp" flush="true">
+																<div class="httpReqCfg">
-																	<jsp:param value="http_req_body" name="regionValue"/>
+																	<c:set var="tabName" value="httpReqHdrTab"></c:set>
-																	<jsp:param value="httpReqBody" name="cfgName"/>
+																	<h4 class="form-section" >
-																	<jsp:param value="httpReqBody${status.index }" name="cfgNameIndex"/>
+																		<spring:message code="http_req_hdr_title" />
-																	<jsp:param value="httpReqBodyList[${status.index }]" name="propertiesName"/>
+																		<small> <span
-																</jsp:include> --%>
+																			class="glyphicon glyphicon-plus  ${tabName}Add"
-																<%@include file="/WEB-INF/views/cfg/stringCfgForm.jsp"%>
+																			onClick="addContent(this,'${tabName}')" title="add"></span></small>
-															</div>
+																	</h4>
-														</c:forEach>
+																	
-													</div>
+																	<%-- <c:set var="regionValue" value="${_cfg.httpReqHdr.cfgType}"></c:set> --%>
-													<!--/request body info-->
+																	<c:forEach items="${_cfg.httpReqHdrList}" var="complexCfg"
-													<!--response header info-->
+																		varStatus="status">
-													<div class="httpResCfg">
+																		<c:set var="cfgName" value="httpReqHdrList[${status.index}]"></c:set>
-														<c:set var="tabName" value="httpResHdrTab"></c:set>
+																		<div class="row boxSolid ${tabName}${status.index} ">
-														<h4 class="form-section" >
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															<spring:message code="http_res_hdr_title" />
+																		</div>
-															<small> <span
+																	</c:forEach>
-															class="glyphicon glyphicon-plus  ${tabName}Add"
+																</div>
-															onClick="addContent(this,'${tabName}')" title="add"></span></small>
+																<!--/request header info-->
-														</h4>
+															</c:if>
-														
+															<c:if test="${region.configRegionValue eq 'http_res_hdr' }">
-														<c:set var="regionValue" value="${_cfg.httpResHdr.cfgType}"></c:set>
+																<!--response header info-->
-														<c:forEach items="${_cfg.httpResHdrList}" var="complexCfg"
+																<div class="httpResCfg">
-															varStatus="status">
+																	<c:set var="tabName" value="httpResHdrTab"></c:set>
-															<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
+																	<h4 class="form-section" >
-															<div class="row boxSolid ${tabName}${status.index} ">
+																		<spring:message code="http_res_hdr_title" />
-																<%-- <jsp:include page="/WEB-INF/views/cfg/complexCfgForm.jsp" flush="true">
+																		<small> <span
-																	<jsp:param value="http_res_hdr" name="regionValue"/>
+																		class="glyphicon glyphicon-plus  ${tabName}Add"
-																	<jsp:param value="httpResHdr" name="cfgName"/>
+																		onClick="addContent(this,'${tabName}')" title="add"></span></small>
-																	<jsp:param value="httpResHdr${status.index }" name="cfgNameIndex"/>
+																	</h4>
-																	<jsp:param value="httpResHdrList[${status.index }]" name="propertiesName"/>
+																	<%-- <c:set var="regionValue" value="${_cfg.httpResHdr.cfgType}"></c:set> --%>
-																</jsp:include> --%>
+																	<c:forEach items="${_cfg.httpResHdrList}" var="complexCfg"
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																		varStatus="status">
-															</div>
+																		<c:set var="cfgName" value="httpResHdrList[${status.index}]"></c:set>
-														</c:forEach>
+																		<div class="row boxSolid ${tabName}${status.index} ">
-													</div>
+	
-													<!--/response header info-->
+																			<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													<!--response body info-->
+																		</div>
-													<div class="httpResCfg">
+																	</c:forEach>
-														<c:set var="tabName" value="httpResBodyTab"></c:set>
+																</div>
-														<h4 class="form-section" >
+																<!--/response header info-->
-															<spring:message code="http_res_body_title" />
+															</c:if>
-															<small> <span
+														</c:if>
-																class="glyphicon glyphicon-plus ${tabName}Add"
+													</c:forEach>
-																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>
 													<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
 													<br>
 													<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>

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>

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>

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>

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;
 		}
 	});