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

bgp、xmpp subscribe_id域不可单独提交，必须搭配其他域

Browse Source
This commit is contained in:
leijun
2018-08-26 15:17:15 +08:00
parent 5b5e63e816
commit b79807ccf5
2 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -19,6 +19,8 @@
$(".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"));
var action=$("input[name='action']:checked").val();
switchAction(action);
}); });
$("#serviceId").val($(".action:checked").attr("serviceId")); $("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId")); $("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -186,7 +188,7 @@
</div> </div>
<!-- dolog begin--> <!-- dolog begin-->
<div class="row"> <div class="row doLog">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -213,7 +215,7 @@
<c:set var="ipCfgIndex" value="0"></c:set> <c:set var="ipCfgIndex" value="0"></c:set>
<c:set var="complexCfgIndex" value="0"></c:set> <c:set var="complexCfgIndex" value="0"></c:set>
<c:set var="strAsCfgIndex" value="0"></c:set> <c:set var="strAsCfgIndex" value="0"></c:set>
<c:set var="strCfgIndex" value="0"></c:set> <c:set var="subscribeIndex" 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-->
@@ -285,45 +287,44 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if> </c:if>
<c:if test="${region.configServiceType == 'subscribe_id'}"> <c:if test="${region.configServiceType eq 'subscribe_id' }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set> <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
<h4 class="form-section"> <h4 class="form-section">
<spring:message code="${region.configRegionValue}" /> <spring:message code="${region.configRegionValue}" />
<small> <span <small> <span
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="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set> <c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIndex}]"></c:set>
<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
<c:choose> <c:choose>
<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}"> <c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
<c:set var="isBreak" value="false" ></c:set> <c:set var="isBreak" value="false" ></c:set>
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg"> <c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:choose> <c:choose>
<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}"> <c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
<div class="row boxSolid ${tabName}${status.index}"> <div class="row ${tabName}${status.index}">
<%@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:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
</c:when> </c:when>
</c:choose> </c:choose>
</c:forEach> </c:forEach>
<c:if test="${!isBreak}"> <c:if test="${!isBreak}">
<div class="row boxSolid ${tabName}${status.index} hidden disabled"> <div class="row ${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:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
</c:if> </c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<div class="row boxSolid ${tabName}${status.index} hidden disabled"> <div class="rows ${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:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if> </c:if>
</c:if> </c:if>
<c:if test="${region.regionType eq 3 }"> <c:if test="${region.regionType eq 3 }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set> <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>

54
src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
View File

@@ -19,6 +19,8 @@
$(".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"));
var action=$("input[name='action']:checked").val();
switchAction(action);
}); });
$("#serviceId").val($(".action:checked").attr("serviceId")); $("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId")); $("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -55,7 +57,7 @@
} }
}); });
//keywords非空校验完成校验二进制字符串 //keywords非空校验完成校验二进制字符串
$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){ $(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
@@ -155,31 +157,35 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message <label class="control-label col-md-3"><spring:message
code="action" /></label> code="action" /></label>
<div class="col-md-6"> <div class="col-md-6">
<c:forEach items="${serviceList}" var="service" <c:forEach items="${serviceList}" var="service"
varStatus="satus"> varStatus="satus">
<label class="radio-inline"> <c:if <label class="radio-inline">
test="${_cfg.functionId eq service.functionId}"> <c:if test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action" <input type="radio" name="action"
serviceId="${service.serviceId }" serviceId="${service.serviceId }"
protocolId="${service.protocolId }" protocolId="${service.protocolId }"
value="${service.action }" class="required action" value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>> <c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<spring:message code="${service.actionCode }" /> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq service.action }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</c:if> </c:if>
</label> </label>
</c:forEach> </c:forEach>
</div> </div>
<div for="action"></div> <div for="action"></div>
</div> </div>
</div> </div>
</div> </div>
<!-- dolog begin--> <!-- dolog begin-->
<div class="row"> <div class="row doLog">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label> <label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -204,7 +210,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="subscribeIndex" value="0"></c:set>
<c:set var="complexCfgIndex" value="0"></c:set> <c:set var="complexCfgIndex" 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 }">
@@ -239,44 +245,44 @@
<!--/ip info--> <!--/ip info-->
</c:if> </c:if>
<c:if test="${region.regionType eq 2 }"> <c:if test="${region.regionType eq 2 }">
<c:if test="${region.configServiceType == 'subscribe_id'}"> <c:if test="${region.configServiceType eq 'subscribe_id' }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set> <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
<h4 class="form-section"> <h4 class="form-section">
<spring:message code="${region.configRegionValue}" /> <spring:message code="${region.configRegionValue}" />
<small> <span <small> <span
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="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set> <c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIndex}]"></c:set>
<c:choose> <c:choose>
<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}"> <c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
<c:set var="isBreak" value="false" ></c:set> <c:set var="isBreak" value="false" ></c:set>
<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg"> <c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
<c:choose> <c:choose>
<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}"> <c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
<div class="row boxSolid ${tabName}${status.index}"> <div class="row ${tabName}${status.index}">
<%@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:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
</c:when> </c:when>
</c:choose> </c:choose>
</c:forEach> </c:forEach>
<c:if test="${!isBreak}"> <c:if test="${!isBreak}">
<div class="row boxSolid ${tabName}${status.index} hidden disabled"> <div class="row ${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:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
</c:if> </c:if>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<div class="row boxSolid ${tabName}${status.index} hidden disabled"> <div class="rows ${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:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</c:if> </c:if>
</c:if> </c:if>