http配置表单界面参数处理优化，参数文件与数据库字典配合使用。

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

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

@@ -92,6 +92,14 @@ public class WebsiteController extends BaseController{
 			resBodyCfg.setCfgType(Constants.HTTP_RES_BODY_REGION);
 			entity.setHttpResBody(resBodyCfg);
 			
+			int httpReqCfgNum = entity.getIpPortList().size()+
+								entity.getHttpUrlList().size()+
+								entity.getHttpReqBodyList().size()+
+								entity.getHttpReqHdrList().size();
+			int httpResCfgNum = entity.getHttpResHdrList().size()+
+								entity.getHttpResBodyList().size();
+			model.addAttribute("httpReqCfgNum", httpReqCfgNum);
+			model.addAttribute("httpResCfgNum", httpResCfgNum);
 			if(entity.getIpPortList().size()==0){
 				entity.getIpPortList().add(ipCfg);
 			}

src/main/resources/nis.properties

@@ -265,12 +265,12 @@ SERVICE_DICT_ITM_TYPE=SERVICE_DICT_ITM_TYPE
 SYS_DICT_ITM_TYPE=SYS_DICT_ITM_TYPE
 area_region=NTC_IP_RANGE
 protocol_num_region=NTC_UNIVERSAL_PROTO_TYPE
-http_ip_region=http_ip
+http_ip_region=NTC_UNIVERSAL_IP
-http_req_hdr_region=http_req_hdr
+http_req_hdr_region=NTC_HTTP_REQ_HDR
 http_req_body_region=NTC_HTTP_REQ_BODY
-http_res_hdr_region=http_res_hdr
+http_res_hdr_region=NTC_HTTP_RES_HDR
 http_res_body_region=NTC_HTTP_RES_BODY
-http_url_region=http_url
+http_url_region=NTC_HTTP_URL
 voip_ip=av_voip_ip
 voip_account=av_voip_account
 ssl_sni_region=ssl_sni

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

@@ -22,9 +22,26 @@
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
-						$(".httpResCfg").addClass("hidden").addClass("disabled");
+						if($("#cfgId").val()!=""){
-						$(".httpReqCfg").removeClass("hidden").removeClass(
+							if($("#httpReqCfgNum").val()>0){
-						"disabled");
+								$("a[for='httpReqCfg']").parent().addClass("active");
+								$("a[for='httpResCfg']").parent().removeClass("active");
+								$(".httpResCfg").addClass("hidden").addClass("disabled");
+								$(".httpReqCfg").removeClass("hidden").removeClass(
+								"disabled");
+							}
+							if($("#httpResCfgNum").val()>0){
+								$("a[for='httpResCfg']").parent().addClass("active");
+								$("a[for='httpReqCfg']").parent().removeClass("active");
+								$(".httpReqCfg").addClass("hidden").addClass("disabled");
+								$(".httpResCfg").removeClass("hidden").removeClass(
+								"disabled");
+							}
+						}else{
+							$(".httpResCfg").addClass("hidden").addClass("disabled");
+							$(".httpReqCfg").removeClass("hidden").removeClass(
+							"disabled");
+						}
 						$("li").on("click", function() {
 							var region = ($(this).find("a").attr("for"));
 							if(region=="httpReqCfg"){
@@ -144,11 +161,13 @@
 						<!-- BEGIN FORM-->
 						<form id="cfgFrom" action="${ctx}/ntc/website/saveHttpCfg"
 							method="post" class="form-horizontal">
-							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
+							<input type="hidden" name="cfgId" id="cfgId" value="${_cfg.cfgId}">
 							<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}">
+							<input type="hidden" id="httpReqCfgNum" value="${httpReqCfgNum}">
+							<input type="hidden" id="httpResCfgNum" value="${httpResCfgNum}">
 
 							<div class="form-body">
 
@@ -233,7 +252,7 @@
 														</c:if>
 													
 														<c:if test="${region.regionType eq 2 }">
-															<c:if test="${region.configRegionValue eq 'NTC_HTTP_URL' }">
+															<c:if test="${region.configRegionValue eq _cfg.httpUrl.cfgType }">
 																<!--url info-->
 																<div class="httpReqCfg">
 																	<c:set var="tabName" value="httpUrlTab"></c:set>
@@ -256,7 +275,7 @@
 																</div>
 																<!--/url info-->
 															</c:if>
-															<c:if test="${region.configRegionValue eq 'NTC_HTTP_REQ_BODY' }">
+															<c:if test="${region.configRegionValue eq _cfg.httpReqBody.cfgType }">
 																<!--request body info-->
 																<div class="httpReqCfg">
 																	<c:set var="tabName" value="httpReqBodyTab"></c:set>
@@ -278,7 +297,7 @@
 																</div>
 																<!--/request body info-->
 															</c:if>
-															<c:if test="${region.configRegionValue eq 'NTC_HTTP_RES_BODY' }">
+															<c:if test="${region.configRegionValue eq _cfg.httpResBody.cfgType }">
 																<!--response body info-->
 																<div class="httpResCfg">
 																	<c:set var="tabName" value="httpResBodyTab"></c:set>
@@ -301,7 +320,7 @@
 															</c:if>
 														</c:if>
 														<c:if test="${region.regionType eq 3 }">
-															<c:if test="${region.configRegionValue eq 'NTC_HTTP_REQ_HDR' }">
+															<c:if test="${region.configRegionValue eq _cfg.httpReqHdr.cfgType }">
 																<!--request header info-->
 																<div class="httpReqCfg">
 																	<c:set var="tabName" value="httpReqHdrTab"></c:set>
@@ -323,7 +342,7 @@
 																</div>
 																<!--/request header info-->
 															</c:if>
-															<c:if test="${region.configRegionValue eq 'NTC_HTTP_RES_HDR' }">
+															<c:if test="${region.configRegionValue eq _cfg.httpResHdr.cfgType }">
 																<!--response header info-->
 																<div class="httpResCfg">
 																	<c:set var="tabName" value="httpResHdrTab"></c:set>