From 78b35d49b2dde7c63096cf2dc4243d17b0a87d8f Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 23 Aug 2018 11:07:29 +0800
Subject: [PATCH] =?UTF-8?q?dns\ssl\mail\http=E4=BF=AE=E6=94=B9subscribeId?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E5=8D=95=E7=8B=AC=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ntc/WebsiteController.java        |  6 ++----
 src/main/resources/nis.properties                   |  2 +-
 src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp | 13 +++++++++----
 .../webapp/WEB-INF/views/cfg/website/dnsForm.jsp    | 13 +++++++++----
 .../webapp/WEB-INF/views/cfg/website/httpForm.jsp   |  7 ++++---
 .../webapp/WEB-INF/views/cfg/website/sslForm.jsp    | 13 +++++++++----
 6 files changed, 34 insertions(+), 20 deletions(-)

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 2f58cd72e..95d747420 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
@@ -99,11 +99,9 @@ public class WebsiteController extends BaseController{
 			int httpReqCfgNum = entity.getIpPortList().size()+
 								entity.getHttpUrlList().size()+
 								entity.getHttpReqBodyList().size()+
-								entity.getHttpReqHdrList().size()+
-								entity.getNtcSubscribeIdCfgList().size();
+								entity.getHttpReqHdrList().size();
 			int httpResCfgNum = entity.getHttpResHdrList().size()+
-								entity.getHttpResBodyList().size()+
-								entity.getNtcSubscribeIdCfgList().size();
+								entity.getHttpResBodyList().size();
 			model.addAttribute("httpReqCfgNum", httpReqCfgNum);
 			model.addAttribute("httpResCfgNum", httpResCfgNum);
 			if(entity.getIpPortList().size()==0){
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index 2a7dd1c5f..9ec763708 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -443,7 +443,7 @@ specific_service_cfg_type_basic_protocol=basic_protocol
 proto_id_region=PROTO_ID
 #拦截IP自定义域key
 keyring_id=keyring_id
-droprate=DROPRATE
+droprate=Droprate
 bandwidth=Bandwidth
 #IP\u9ed8\u8ba4\u503c
 ipv4_default_ip_value=\:\:
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 ddc89112c..8a6a745ea 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
@@ -40,8 +40,13 @@
 									submitHandler : function(form) {
 										
 										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
-										if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
@@ -311,7 +316,7 @@
 												<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}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
@@ -320,14 +325,14 @@
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
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 bcfdc5a60..b984969b6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -35,8 +35,13 @@
 									submitHandler : function(form) {
 										
 										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
-										if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
@@ -317,7 +322,7 @@
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
@@ -326,14 +331,14 @@
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
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 fe90cdc15..4789fc666 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
@@ -71,16 +71,17 @@
 									submitHandler : function(form) {
 										//loading('onloading...');
 										var flag = true;
-										var subscribeId=$(".subscribeId").find(".boxSolid.hidden").length;
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
 										if(!$(".httpReqCfg").hasClass("hidden")){
-											if(($(".httpReqCfg").find(".boxSolid").length+1)==($(".httpReqCfg").find(".boxSolid.hidden").length+subscribeId)){
+											console.log($(".httpReqCfg").find(".boxSolid").length);
+											console.log($(".httpReqCfg").find(".boxSolid.hidden"));
+											if($(".httpReqCfg").find(".boxSolid").length==$(".httpReqCfg").find(".boxSolid.hidden").length){
 												top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 												return;
 											}
 										}
 										if(!$(".httpResCfg").hasClass("hidden")){
-											if(($(".httpResCfg").find(".boxSolid").length+1)==($(".httpResCfg").find(".boxSolid.hidden").length+subscribeId)){
+											if($(".httpResCfg").find(".boxSolid").length==$(".httpResCfg").find(".boxSolid.hidden").length){
 												top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 												return;
 											}
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 bc739e3d2..bed681b62 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -34,8 +34,13 @@
 									submitHandler : function(form) {
 										//loading('onloading...');
 										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
-										if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
@@ -295,7 +300,7 @@
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
@@ -304,7 +309,7 @@
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:if test="${region.configServiceType eq 'subscribe_id' }">
@@ -313,7 +318,7 @@
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:if test="${region.configServiceType eq 'subscribe_id' }">