gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ssl冲突解决

Browse Source
This commit is contained in:
duandongmei
2018-08-23 09:35:39 +08:00
parent 96217e2910
commit 1cec30a6b1
1 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

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