diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index 874e3f412..afbf124cb 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/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); } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 544e643bb..9bcfe7722 100644 --- a/src/main/resources/nis.properties +++ b/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_req_hdr_region=http_req_hdr +http_ip_region=NTC_UNIVERSAL_IP +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 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 29922dc9b..1b5fe82b4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp +++ b/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"); - $(".httpReqCfg").removeClass("hidden").removeClass( - "disabled"); + if($("#cfgId").val()!=""){ + if($("#httpReqCfgNum").val()>0){ + $("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 @@