From 1cec30a6b125cdc9e03c6ebd20da587d2759f040 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Thu, 23 Aug 2018 09:35:39 +0800
Subject: [PATCH] =?UTF-8?q?ssl=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/website/sslForm.jsp     | 53 ++++++++++++++++---
 1 file changed, 45 insertions(+), 8 deletions(-)

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 53754f797..bc739e3d2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -13,14 +13,14 @@
 	$(document)
 			.ready(
 					function() {
-						initCommIpVal();
-						/* $("#cancel").on("click", function() {
+						/*initCommIpVal();
+						 $("#cancel").on("click", function() {
 							window.history.back();
-						});
+						});*/
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
-						}); */
+						}); 
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
 						$("#cfgFrom").validate(
@@ -217,6 +217,7 @@
 								<!-- dolog end-->
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIdIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 									<c:if test="${region.regionType eq 1 }">
 										<!--ip info-->
@@ -257,7 +258,12 @@
 												class="glyphicon glyphicon-plus ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
+										<c:if test="${region.configServiceType eq 'subscribe_id' }">
+											<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+										</c:if>
+										<c:if test="${region.configServiceType ne 'subscribe_id' }">
+											<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
+										</c:if>
 										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.sslList)>0}">
@@ -269,7 +275,9 @@
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															<c:if test="${region.configServiceType ne 'subscribe_id' }">
+																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															</c:if>
 														</c:when>
 													</c:choose>
 												</c:forEach>
@@ -277,14 +285,43 @@
 													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															<c:if test="${region.configServiceType ne 'subscribe_id' }">
+																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															</c:if>
+												</c:if>
+											</c:when>
+											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<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}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:if test="${region.configServiceType eq 'subscribe_id' }">
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+															</c:if>
 												</c:if>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
-												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												<c:if test="${region.configServiceType eq 'subscribe_id' }">
+													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+												</c:if>
+												<c:if test="${region.configServiceType ne 'subscribe_id' }">
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
 											</c:otherwise>
 										</c:choose>
 									</c:if>