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

dns\ssl\mail\http修改subscribeId不允许单独配置问题

Browse Source
This commit is contained in:
duandongmei
2018-08-23 11:07:29 +08:00
parent 8aa82dda00
commit 78b35d49b2
6 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
View File

@@ -99,11 +99,9 @@ public class WebsiteController extends BaseController{
int httpReqCfgNum = entity.getIpPortList().size()+ int httpReqCfgNum = entity.getIpPortList().size()+
entity.getHttpUrlList().size()+ entity.getHttpUrlList().size()+
entity.getHttpReqBodyList().size()+ entity.getHttpReqBodyList().size()+
entity.getHttpReqHdrList().size()+ entity.getHttpReqHdrList().size();
entity.getNtcSubscribeIdCfgList().size();
int httpResCfgNum = entity.getHttpResHdrList().size()+ int httpResCfgNum = entity.getHttpResHdrList().size()+
entity.getHttpResBodyList().size()+ entity.getHttpResBodyList().size();
entity.getNtcSubscribeIdCfgList().size();
model.addAttribute("httpReqCfgNum", httpReqCfgNum); model.addAttribute("httpReqCfgNum", httpReqCfgNum);
model.addAttribute("httpResCfgNum", httpResCfgNum); model.addAttribute("httpResCfgNum", httpResCfgNum);
if(entity.getIpPortList().size()==0){ if(entity.getIpPortList().size()==0){

2
src/main/resources/nis.properties
View File

@@ -443,7 +443,7 @@ specific_service_cfg_type_basic_protocol=basic_protocol
proto_id_region=PROTO_ID proto_id_region=PROTO_ID
#拦截IP自定义域key #拦截IP自定义域key
keyring_id=keyring_id keyring_id=keyring_id
droprate=DROPRATE droprate=Droprate
bandwidth=Bandwidth bandwidth=Bandwidth
#IP\u9ed8\u8ba4\u503c #IP\u9ed8\u8ba4\u503c
ipv4_default_ip_value=\:\: ipv4_default_ip_value=\:\:

13
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -40,8 +40,13 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; 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'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
@@ -311,7 +316,7 @@
<c:forEach items="${_cfg.complexList}" var="cfg"> <c:forEach items="${_cfg.complexList}" var="cfg">
<c:choose> <c:choose>
<c:when test="${region.configRegionCode eq complexCfg.cfgRegionCode and !isBreak}"> <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"%> <%@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>
@@ -320,14 +325,14 @@
</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 boxSolid subscribeId ${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="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set> <c:set var="subscribeIdIndex" value="${subscribeIdIndex+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="row boxSolid subscribeId ${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="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set> <c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>

13
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -35,8 +35,13 @@
submitHandler : function(form) { submitHandler : function(form) {
var flag = true; 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'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
@@ -317,7 +322,7 @@
<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 boxSolid subscribeId ${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>
@@ -326,14 +331,14 @@
</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 boxSolid subscribeId ${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="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set> <c:set var="subscribeIdIndex" value="${subscribeIdIndex+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="row boxSolid subscribeId ${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="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set> <c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>

7
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -71,16 +71,17 @@
submitHandler : function(form) { submitHandler : function(form) {
//loading('onloading...'); //loading('onloading...');
var flag = true; var flag = true;
var subscribeId=$(".subscribeId").find(".boxSolid.hidden").length;
//代表所有业务都隐藏了，提示必须增加一种业务数据 //代表所有业务都隐藏了，提示必须增加一种业务数据
if(!$(".httpReqCfg").hasClass("hidden")){ 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'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
} }
if(!$(".httpResCfg").hasClass("hidden")){ 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'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }

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

@@ -34,8 +34,13 @@
submitHandler : function(form) { submitHandler : function(form) {
//loading('onloading...'); //loading('onloading...');
var flag = true; 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'/>"); top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return; return;
} }
@@ -295,7 +300,7 @@
<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 boxSolid subscribeId ${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>
@@ -304,7 +309,7 @@
</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 boxSolid subscribeId ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
</div> </div>
<c:if test="${region.configServiceType eq 'subscribe_id' }"> <c:if test="${region.configServiceType eq 'subscribe_id' }">
@@ -313,7 +318,7 @@
</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 subscribeId ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
</div> </div>
<c:if test="${region.configServiceType eq 'subscribe_id' }"> <c:if test="${region.configServiceType eq 'subscribe_id' }">