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

(1)asn导入加入组织国家，asn号验证，组织国家不能为空，asn号不能为两个组织所有

Browse Source 
(2)新增asn_keyword_cfg表，用于保存并下发有效且含审核通过asn ip的 asn号
(3)asn 导入去除条数限制
(4)页面asn select选项还是会影响加载页面速度，现在改为input
(5)asn_group_info 修改org_group_id为issued_ips，用于保存审核通过的asn ip
(6)分组复用url配置文件补全v1
This commit is contained in:
wangxin
2019-01-06 11:24:49 +08:00
parent 9979bb26b2
commit f56a0fe09a
37 changed files with 968 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,10 @@
$("#intype").val("${cfg.organization}");
}else if(''!="${cfg.asnId}"){
$("#intype").val("${cfg.asnId}");
}else if(''!="${cfg.country}"){
$("#intype").val("${cfg.country}");
}else if(''!="${cfg.detail}"){
$("#intype").val("${cfg.detail}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
@@ -60,6 +64,20 @@
}
}
});
if(canDel){
tip='<spring:message code="can_not_delete_asn_group_with_audited_ip_address"/>'
$.ajax({
type:'post',
url:'${ctx}/basics/asnGroup/ajaxGetAuditedIPAddress',
data:{"asnIds":asnIds.join(',')},
async:false,
success:function(data,textStatus){//处理返回结果
if(data){
canDel=false;
}
}
});
}
}
if(canDel){
var added = "";
@@ -131,6 +149,8 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="organization"><spring:message code="organization"></spring:message></form:option>
<form:option value="asnId"><spring:message code="asn_no"></spring:message></form:option>
<form:option value="country"><spring:message code="country"></spring:message></form:option>
<form:option value="detail"><spring:message code="detail"></spring:message></form:option>
</form:select>
</div>
@@ -213,7 +233,7 @@
<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.asn_id"><spring:message code="asn_no"/></th>
<th><spring:message code="is_issued"/></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>

27
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
View File

@@ -17,9 +17,9 @@ $(function(){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
$("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
/* $("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
$("[name='detail']").val($("[name='userRegion1'] option:selected").attr("detail"));
$("[name='asnIpGroup']").val($("[name='userRegion1'] option:selected").attr("asnIpGroup"));
$("[name='asnIpGroup']").val($("[name='userRegion1'] option:selected").attr("asnIpGroup")); */
loading('onloading...');
form.submit();
},
@@ -30,7 +30,7 @@ $(function(){
var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId");
$("#asnId").val(asnId);
}); */
var organization=$("[name='organization']").val();
/* var organization=$("[name='organization']").val();
if(organization){
$.ajax({
type:'post',
@@ -69,7 +69,7 @@ $(function(){
}
}
});
});
}); */
});
//业务窗口打开
var addContent = function(obj, contentClassName) {
@@ -199,7 +199,7 @@ var reSort=function(obj,index){
<div for="asnIpGroup"></div>
</div>
</div> --%>
<div class="col-md-6">
<%-- <div class="col-md-6">
<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">
@@ -208,24 +208,25 @@ var reSort=function(obj,index){
<option value="${policyGroup.groupName}" <c:if test="${_cfg.organization eq policyGroup.groupName }">selected</c:if>>${policyGroup.groupName}</option>
</c:forEach>
</select>
<%-- <input class="form-control required" type="text" name="organization" value="${_cfg.organization}"> --%>
<input class="form-control required" type="text" name="organization" value="${_cfg.organization}">
</div>
<div for="organization"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
--%>
<div class="col-md-6">
<div class="form-group">
<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" type="text" name="userRegion1" value="${_cfg.userRegion1}"> --%>
<%-- <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}">
</div>
<div for="userRegion1"></div>
</div>
</div>
</div>
<%-- <div class="row">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="country"/></label>
@@ -246,7 +247,7 @@ var reSort=function(obj,index){
<div for="detail"></div>
</div>
</div>
</div>
</div> --%>
<!-- desc and action -->
<h4 class="form-section">
<spring:message code="asn_ip_configuration" />

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

@@ -14,9 +14,9 @@ $(function(){
$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
},
submitHandler: function(form){
$("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
/* $("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
$("[name='detail']").val($("[name='userRegion1'] option:selected").attr("detail"));
$("[name='asnIpGroup']").val($("[name='userRegion1'] option:selected").attr("asnIpGroup"));
$("[name='asnIpGroup']").val($("[name='userRegion1'] option:selected").attr("asnIpGroup")); */
loading('onloading...');
form.submit();
},
@@ -27,7 +27,7 @@ $(function(){
var asnId=$(this).find("option[value='"+$(this).val()+"']").attr("asnId");
$("#asnId").val(asnId);
}); */
var organization=$("[name='organization']").val();
/* var organization=$("[name='organization']").val();
if(organization){
$.ajax({
type:'post',
@@ -70,7 +70,7 @@ $(function(){
}
}
});
});
}); */
});
</script>
</head>
@@ -131,19 +131,30 @@ $(function(){
</div>
</div>
<div class="col-md-6">
<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="organization" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupName}" <c:if test="${_cfg.organization eq policyGroup.groupName }">selected</c:if>>${policyGroup.groupName}</option>
</c:forEach>
</select>
<%-- <input class="form-control required" type="text" name="organization" value="${_cfg.organization}"> --%>
</div>
<div for="organization"></div>
</div>
</div>
<div class="form-group">
<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}">
</div>
<div for="userRegion1"></div>
</div>
</div>
<%-- <div class="col-md-6">
<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="organization" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupName}" <c:if test="${_cfg.organization eq policyGroup.groupName }">selected</c:if>>${policyGroup.groupName}</option>
</c:forEach>
</select>
<input class="form-control required" type="text" name="organization" value="${_cfg.organization}">
</div>
<div for="organization"></div>
</div>
</div> --%>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
@@ -170,17 +181,8 @@ $(function(){
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<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" type="text" name="userRegion1" value="${_cfg.userRegion1}"> --%>
</div>
<div for="userRegion1"></div>
</div>
</div>
<%-- <div class="row">
<div class="col-md-6">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="country"/></label>
@@ -201,7 +203,7 @@ $(function(){
<div for="detail"></div>
</div>
</div>
</div>
</div> --%>
<!-- desc and action -->
<%-- <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> --%>
<div class="row ipInfo">