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

ASN 版本恢复1月4号之版本

Browse Source
This commit is contained in:
wangxin
2019-01-18 16:21:20 +08:00
parent ed77da00c4
commit de8496e003
32 changed files with 322 additions and 1203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -111,15 +111,12 @@ function update(url){
var cked = $("tbody tr td input.i-checks:checkbox:checked");
if($(checkboxes).filter(":checked").length==1){
if(cked.val()==1){
//增加asn ip域配置判断，如果是asn ip业务，审核通过的也可以修改 functionId=600
if($("input[name='functionId']").val() != 600){
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
}
}/* else if(cked.val()==3){
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
} */
}else if(cked.val()==3){
/* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return; */
}
//处理asnIp,asn组下发过的ip配置不允许修改
if(cked.attr("asnGroup")&&cked.attr("isValid")){
var asnGroup=cked.attr("asnGroup");
@@ -393,18 +390,6 @@ function cancelPassOpt(url){
});
return flag;
}
//验证是否可删除
function validateIsDelete(checkboxes){
var flag = false;
$(checkboxes).filter(":checked").each(function(){
//alert($(this).val());
if($(this).val()!=0 && $(this).val()!=3){//状态为3的配置为取消审核的配置，可删除
flag = true;
return;
}
});
return flag;
}
//验证选择的配置，是否有审核通过的
function validatePass(checkboxes){
var flag = false;

55
src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp
View File

@@ -143,7 +143,7 @@
<div class="pull-left">
<%-- <div class="input-group">
<div class="input-group">
<div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" >
@@ -157,38 +157,8 @@
<input id="intype" class="form-control input-medium" type="text" value="">
</div> --%>
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="organization"/></span>
</div>
<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="asn_no"/></span>
</div>
<input name="asnId" id="asnId" type="text" class="form-control input-medium" value="${cfg.asnId}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="country"/></span>
</div>
<input name="country" id="country" type="text" class="form-control input-medium" value="${cfg.country}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="detail"/></span>
</div>
<input name="detail" id="detail" type="text" class="form-control input-medium" value="${cfg.detail}" />
</div>
</div>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
@@ -260,11 +230,10 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.organization"><spring:message code="organization"/></th>
<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
<th class="sort-column r.country"><spring:message code="country"/></th>
<th class="sort-column r.detail"><spring:message code="detail"/></th>
<th class="sort-column r.is_used"><spring:message code="is_issued"/></th>
<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th class="sort-column r.detail"><spring:message code="detail"/></th>
<th class="sort-column r.asn_id"><spring:message code="asn_no"/></th>
<th class="sort-column r.is_valid"><spring:message code="is_issued"/></th>
<th><spring:message code="creator"/></th>
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
<th><spring:message code="editor"/></th>
@@ -278,26 +247,22 @@
<td>
<a href="javascript:;" data-original-title="${cfg.organization}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.organization,50)}
${fns:abbr(cfg.organization,20)}
</a>
</td>
<td>${cfg.asnId}</td>
<td>
<a href="javascript:;" data-original-title="${cfg.country}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.country,50)}
${fns:abbr(cfg.country,20)}
</a>
</td>
<td>
<a href="javascript:;" data-original-title="${cfg.detail}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.detail,50)}
${fns:abbr(cfg.detail,20)}
</a>
</td>
<td>
<c:if test="${cfg.isUsed==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isUsed==1}"><spring:message code="yes"/></c:if>
</td>
<td>${cfg.asnId}</td>
<td>
<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>

5
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
View File

@@ -95,11 +95,8 @@ $(function(){
<!-- BEGIN FORM-->
<form id="cfgFrom" action="${ctx}/basics/asn/update" method="post" class="form-horizontal">
<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
<input type="hidden" name="regionId" value="${_cfg.regionId}">
<input type="hidden" name="compileId" value="${_cfg.compileId}">
<input type="hidden" name="functionId" value="${_cfg.functionId}">
<input type="hidden" name="isValid" value="${_cfg.isValid}">
<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
<input type="hidden" id="requestId" name="requestId" value="${_cfg.requestId}">
@@ -138,7 +135,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ASN"/></label>
<div class="col-md-6">
<!-- <select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search"></select> -->
<input class="form-control required digits asnMustExists" type="text" name="userRegion1" value="${_cfg.userRegion1}" ctx="${ctx}" <c:if test="${_cfg.isAudit eq 1}">readonly="readonly"</c:if>/>
<input class="form-control required digits asnMustExists" type="text" name="userRegion1" value="${_cfg.userRegion1}" ctx="${ctx}">
</div>
<div for="userRegion1"></div>
</div>

34
src/main/webapp/WEB-INF/views/cfg/ipaddr/asnForm.jsp Normal file
View File

@@ -0,0 +1,34 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<title></title>
<script type="text/javascript">
</script>
</head>
<div class="row">
<div class="pull-right">
<span class="glyphicon glyphicon-remove pull-right" title="remove"
onClick="delContent('${tabName}${status.index}','${tabName}Add');" />
</div>
</div>
<br>
<div class="row">
<div class="col-md-6">
<%-- <input type="hidden" name="userRegion5" value="${_cfg.userRegion5}"> --%>
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="organization"/></label>
<div class="col-md-6">
<%-- <select name="userRegion4" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup">
<option asnId="${policyGroup.asnId}" value="${policyGroup.groupName}" <c:if test="${asn==policyGroup.groupName }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select> --%>
<input class="form-control required invisibleChar orgMustExists" type="text" name="userRegion4" value="${asn}" ctx="${ctx}">
</div>
<div for="userRegion4"></div>
</div>
</div>
</div>
<br>
</html>

124
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -27,31 +27,61 @@
}
}
//hide actions
/* if(isAsn==1){
if(isAsn==1){
hideAction(0,asnRegionCode);
}else{
hideAction(1,asnRegionCode);
} */
/* $("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click();*/
if($(".action:checked").val()==32){
$(".subscribeId").find(".glyphicon-remove").click();
$(".subscribeId").prev("h4").addClass("hidden");
$(".asnRegionV").find(".glyphicon-remove").click();
$(".asnRegionV").prev("h4").addClass("hidden");
}
var regionCodes=$(".action:checked").attr("regionCode").split(",");
$("h4[class*='ipPortListTitle']").each(function(){
var has=false;
for(var ind in regionCodes){
if($(this).hasClass("ipPortListTitle"+regionCodes[ind])){
has=true;
if(isAsn==0){
$("[class~='glyphicon-plus'][class~='ipPortList']").click();
$("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click();
/*if(action==32){
$(".subscribeId").find(".glyphicon-remove").click();
$(".subscribeId").prev("h4").addClass("hidden");
}*/
var regionCodes=$(".action:checked").attr("regionCode").split(",");
$("h4[class*='ipPortListTitle']").each(function(){
var has=false;
for(var ind in regionCodes){
if($(this).hasClass("ipPortListTitle"+regionCodes[ind])){
has=true;
}
}
if(!has){
$(this).addClass("hidden");
}
});
processAction(isAsn,$(".ipPortList"));
}else{
$("[class~='glyphicon-plus'][class~='asn']").click();
$("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click();
processAction(isAsn,$(".asn"));
}
//隐藏显示asn
if($("[name='action']:checked").val()==32||$("[name='action']:checked").val()==64){
console.log(111);
$("h4.form-section.asn").addClass("hidden");
}else{
$("h4.form-section.asn").removeClass("hidden");
}
$(".glyphicon-plus").on("click",function(){
if($(this).hasClass("ipPortList")){
isAsn=0;
hideAction(1,asnRegionCode);
$("[class~='boxSolid'][class~='asn']").find(".glyphicon-remove").click();
}
if(!has){
$(this).addClass("hidden");
if($(this).hasClass("asn")){
isAsn=1;
hideAction(0,asnRegionCode);
$("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click();
}
});
processAction(isAsn,$(".ipPortList"));
//处理asn id
$(".asn").find("input[name='userRegion5']").val($(".asn").find("select[name='userRegion4'] option:selected").attr("asnId"));
$(".asn").find("select[name='userRegion4']").on("change",function(){
var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId");
$(this).parents(".row").find("input[name='userRegion5']").val(asnId);
});
$(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
@@ -80,16 +110,15 @@
$(this).attr("name",'cfgRegionCode');
$("#cfgType"+$(this).val()).attr("name",'cfgType');
}
});
});
var tabInfo=$(".ipPortList");
if(tabInfo){
tabInfo.find("[name$='cfgType']").val(cfgType);
tabInfo.find("[name$='cfgRegionCode']").val(cfgRegionCode);
}
/*if(isAsn==0){
if(isAsn==0){
changeIPVal(tabInfo);
} */
}
processAction(isAsn,tabInfo);
/* if(tabInfo){
tabInfo.find("[name$='cfgType']").val(cfgType);
@@ -98,11 +127,8 @@
if($(this).val()==32||$(this).val()==96){
$(".subscribeId").find(".glyphicon-remove").click();
$(".subscribeId").prev("h4").addClass("hidden");
$(".asnRegionV").find(".glyphicon-remove").click();
$(".asnRegionV").prev("h4").addClass("hidden");
}else{
$(".subscribeId").prev("h4").removeClass("hidden");
$(".asnRegionV").prev("h4").removeClass("hidden");
}
//处理ICMP
if($(this).val()==32){
@@ -119,20 +145,17 @@
} */
//隐藏显示asn
/* if($(this).val()==32||$(this).val()==64){
if($(this).val()==32||$(this).val()==64){
$("h4.form-section.asn").addClass("hidden");
}else{
$("h4.form-section.asn").removeClass("hidden");
} */
}
});
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
switchRateLimitType();
})
if($("input[name='cfgId']").val() == null || $("input[name='cfgId']").val() == ''){
$(".glyphicon-plus").first().click();
}
$("#cfgFrom").validate(
{
errorPlacement : function(error, element) {
@@ -150,14 +173,14 @@
subscribeId=1;
}
//代表所有业务都隐藏了，提示必须增加一种业务数据
var boxSolidLenth=$(".boxSolid").length;
/* var boxSolidLenth=$(".boxSolid").length;
if($(".boxSolid").hasClass("subscribeId")){
boxSolidLenth=boxSolidLenth-1;
}
if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;
}
} */
//代表所有区域都隐藏了，提示必须增加个区域信息
if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
@@ -196,10 +219,10 @@
flag=flag1;
}
if(flag){
/* if(isAsn==0){
if(isAsn==0){
$("input[name='userRegion4']").attr("disabled",true);
$("input[name='userRegion5']").attr("disabled",true);
} */
}
$("input[name$='userRegion1']").attr("disabled",false);
$("input[name$='exprType']").attr("disabled",false);
//将disable属性的元素删除
@@ -304,12 +327,12 @@ var processAction=function(configType,obj){
var selectedProtocol=o.find("select[name$='protocol'] option:selected").attr("value");
if(action==32){
//先清空，再添加
o.find("select[name$='protocol']").empty();
/* o.find("select[name$='protocol']").empty();
$.ipcommon.protocol.each(function(){
if($(this).attr("value")==6||$(this).attr("value")==17||$(this).attr("value")==1||$(this).attr("value")==50||$(this).attr("value")==15||$(this).attr("value")==51){
if($(this).attr("value")==0||$(this).attr("value")==6||$(this).attr("value")==17||$(this).attr("value")==1||$(this).attr("value")==8||$(this).attr("value")==15){
o.find("select[name$='protocol']").append($(this));
}
})
}) */
$(".ratelimitAction").addClass("hidden");
$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
}else if(action==16){
@@ -324,12 +347,12 @@ var processAction=function(configType,obj){
$(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
}else if(action==64){
//先清空，再添加
o.find("select[name$='protocol']").empty();
/* o.find("select[name$='protocol']").empty();
$.ipcommon.protocol.each(function(){
if($(this).attr("value")==6||$(this).attr("value")==17){
if($(this).attr("value")==0||$(this).attr("value")==6||$(this).attr("value")==17){
o.find("select[name$='protocol']").append($(this));
}
})
}) */
$(".ratelimitAction").removeClass("hidden");
var rateLimitType=$("input[name='userRegion1']:checked").val();
if(rateLimitType == 0){//丢包率
@@ -367,8 +390,6 @@ var processAction=function(configType,obj){
}
}
//drop动作不展示asn信息
}
}
@@ -676,21 +697,20 @@ var showHideIPSECProtocol=function(obj){
</c:if>
<c:if test="${region.regionType eq 7 }">
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
<h4 class="form-section asnRegionH">
<h4 class="form-section asn">
<spring:message code="${region.configRegionValue}" />
<small> <span
class="glyphicon glyphicon-plus ${tabName}Add"
class="glyphicon glyphicon-plus asn ${tabName}Add"
onClick="addContent(this,'${tabName}')" title="add"></span></small>
</h4>
<c:set var="cfgName" value="asnKeywords[${asnIndex}]"></c:set>
<c:choose>
<c:when test="${fn:length(_cfg.asnKeywords)>0}">
<c:when test="${fn:length(fn:split(_cfg.userRegion4,','))>0}">
<c:set var="isBreak" value="false" ></c:set>
<c:forEach items="${_cfg.asnKeywords}" var="cfg">
<c:forEach items="${fn:split(_cfg.userRegion4,',')}" var="asn">
<c:choose>
<c:when test="${!isBreak}">
<div class="row boxSolid ${tabName}${status.index} asnRegionV">
<%@include file="/WEB-INF/views/cfg/asnForm.jsp"%>
<div class="row boxSolid asn ${tabName}${status.index}">
<%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
</div>
<c:set var="isBreak" value="true" ></c:set>
<c:set var="asnIndex" value="${asnIndex+1 }"></c:set>
@@ -698,15 +718,15 @@ var showHideIPSECProtocol=function(obj){
</c:choose>
</c:forEach>
<c:if test="${!isBreak}">
<div class="row boxSolid ${tabName}${status.index} hidden disabled asnRegionV">
<%@include file="/WEB-INF/views/cfg/asnForm.jsp"%>
<div class="row boxSolid asn ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
</div>
<c:set var="asnIndex" value="${asnIndex+1 }"></c:set>
</c:if>
</c:when>
<c:otherwise>
<div class="row boxSolid ${tabName}${status.index} hidden disabled asnRegionV">
<%@include file="/WEB-INF/views/cfg/asnForm.jsp"%>
<div class="row boxSolid asn ${tabName}${status.index} hidden disabled">
<%@include file="/WEB-INF/views/cfg/ipaddr/asnForm.jsp"%>
</div>
<c:set var="asnIndex" value="${asnIndex+1 }"></c:set>
</c:otherwise>