Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop
This commit is contained in:
tanghao
@@ -17,16 +17,16 @@ $(function(){
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
}); */
|
||||
|
||||
if($("#groupType").val() == 4){
|
||||
if("${_cfg.groupType}" == 4){
|
||||
$("#asnNo").parents(".form-group").removeClass("hidden");
|
||||
}
|
||||
$("#groupType").on("change",function(){
|
||||
/* $("#groupType").on("change",function(){
|
||||
if($(this).val() != 4){
|
||||
$("#asnNo").parents(".form-group").addClass("hidden");
|
||||
}else{
|
||||
$("#asnNo").parents(".form-group").removeClass("hidden");
|
||||
}
|
||||
});
|
||||
}); */
|
||||
$("#cfgFrom").validate({
|
||||
errorPlacement: function(error,element){
|
||||
if($(element).parents().hasClass("tagsinput")){
|
||||
@@ -49,7 +49,18 @@ $(function(){
|
||||
<div class="page-content">
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="policy_group_manage"></spring:message>
|
||||
<c:if test="${_cfg.groupType==1}">
|
||||
<spring:message code="dns_group_manage"/>
|
||||
</c:if>
|
||||
<c:if test="${_cfg.groupType==4}">
|
||||
<spring:message code="asn_group_manage"/>
|
||||
</c:if>
|
||||
<c:if test="${_cfg.groupType==5}">
|
||||
<spring:message code="ip_group_manage"/>
|
||||
</c:if>
|
||||
<c:if test="${_cfg.groupType==6}">
|
||||
<spring:message code="ip_spoofing_group_manage"/>
|
||||
</c:if>
|
||||
</h3>
|
||||
|
||||
<div class="row">
|
||||
@@ -66,6 +77,7 @@ $(function(){
|
||||
<!-- BEGIN FORM-->
|
||||
<form:form id="cfgFrom" modelAttribute="_cfg" action="${ctx}/basics/policyGroup/saveOrUpdate" method="post" class="form-horizontal">
|
||||
<input type="hidden" name="groupId" value="${_cfg.groupId}">
|
||||
<input type="hidden" name="groupType" value="${_cfg.groupType}">
|
||||
<div class="form-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
@@ -77,7 +89,7 @@ $(function(){
|
||||
<div for="groupName"></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="group_type"/></label>
|
||||
<div class="col-md-6">
|
||||
@@ -91,7 +103,7 @@ $(function(){
|
||||
</div>
|
||||
<div for="groupType"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div> --%>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
|
||||
@@ -8,6 +8,8 @@
|
||||
//搜索框提示语初始化
|
||||
if("${cfg.groupName}"){
|
||||
$("#intype").val("${cfg.groupName}");
|
||||
}else if(''!="${cfg.asnNo}"){
|
||||
$("#intype").val("${cfg.asnNo}");
|
||||
}else{
|
||||
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
|
||||
}
|
||||
@@ -116,14 +118,25 @@
|
||||
|
||||
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
|
||||
<button type="button" class="btn btn-primary"
|
||||
onClick="javascript:window.location='${ctx}/basics/policyGroup/policyGroupForm'">
|
||||
onClick="javascript:window.location='${ctx}/basics/policyGroup/policyGroupForm?groupType=${cfg.groupType}'">
|
||||
<i class="fa fa-plus"></i>
|
||||
<spring:message code="add"></spring:message></button>
|
||||
<%--</shiro:hasPermission>--%>
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="policy_group_manage"/>
|
||||
<c:if test="${cfg.groupType==1}">
|
||||
<spring:message code="dns_group_manage"/>
|
||||
</c:if>
|
||||
<c:if test="${cfg.groupType==4}">
|
||||
<spring:message code="asn_group_manage"/>
|
||||
</c:if>
|
||||
<c:if test="${cfg.groupType==5}">
|
||||
<spring:message code="ip_group_manage"/>
|
||||
</c:if>
|
||||
<c:if test="${cfg.groupType==6}">
|
||||
<spring:message code="ip_spoofing_group_manage"/>
|
||||
</c:if>
|
||||
</h3>
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="col-md-12">
|
||||
@@ -133,13 +146,14 @@
|
||||
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/policyGroup/policyGroupList" method="post" class="form-search">
|
||||
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
||||
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
||||
<input id="groupType" name="groupType" type="hidden" value="${cfg.groupType}"/>
|
||||
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
|
||||
callback="page();" />
|
||||
<!-- 筛选按钮展开状态-->
|
||||
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
|
||||
<!-- 搜索内容与操作按钮栏 -->
|
||||
<div class="col-md-12">
|
||||
<div class="pull-left">
|
||||
<%-- <div class="pull-left">
|
||||
<spring:message code='group_type'/>
|
||||
<select name="groupType" class="selectpicker select2 input-small">
|
||||
<option value=""><spring:message code="all_types"/></option>
|
||||
@@ -155,7 +169,7 @@
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
</div> --%>
|
||||
|
||||
<div class="pull-left">
|
||||
|
||||
@@ -164,7 +178,9 @@
|
||||
|
||||
<form:select path="seltype" class="selectpicker select2 input-small" >
|
||||
<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
|
||||
<c:if test="${cfg.groupType==4}">
|
||||
<form:option value="asnNo"><spring:message code="asn_no"></spring:message></form:option>
|
||||
</c:if>
|
||||
</form:select>
|
||||
|
||||
</div>
|
||||
@@ -180,8 +196,8 @@
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<%-- <shiro:hasPermission name="avContUrl:config"> --%>
|
||||
<sys:delRow url="${ctx}/basics/policyGroup/policyGroupForm" id="contentTable" label="update"></sys:delRow>
|
||||
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0')" data-toggle="tooltip" data-placement="top">
|
||||
<sys:delRow url="${ctx}/basics/policyGroup/policyGroupForm?groupType=${cfg.groupType}" id="contentTable" label="update"></sys:delRow>
|
||||
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0&groupType=${cfg.groupType}')" data-toggle="tooltip" data-placement="top">
|
||||
<i class="fa fa-trash"> <spring:message code="delete"/></i>
|
||||
</a>
|
||||
<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
|
||||
@@ -245,7 +261,9 @@
|
||||
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
|
||||
<th><spring:message code="group_name"/></th>
|
||||
<th><spring:message code="group_type"/></th>
|
||||
<th><spring:message code="asn_no"/></th>
|
||||
<c:if test="${cfg.groupType==4}">
|
||||
<th><spring:message code="asn_no"/></th>
|
||||
</c:if>
|
||||
<th><spring:message code="desc"/></th>
|
||||
<th><spring:message code="creator"/></th>
|
||||
<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
|
||||
@@ -269,7 +287,9 @@
|
||||
<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
<c:if test="${cfg.groupType==4}">
|
||||
<td>${cfg.asnNo}</td>
|
||||
</c:if>
|
||||
<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
|
||||
<td>${cfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
|
||||
@@ -50,6 +50,20 @@ $(function(){
|
||||
}
|
||||
}
|
||||
});
|
||||
var maxTtl=$("[name$=upBoundary]").val();
|
||||
maxTtl = parseInt(maxTtl);
|
||||
var minTtl=$("[name$=lowBoundary]").val();
|
||||
minTtl = parseInt(minTtl);
|
||||
if(maxTtl > 4294967295){
|
||||
message="<spring:message code='min'/>";
|
||||
$("div[for=upBoundary]").html("<label for=\"upBoundary\" class=\"error\" id=\"upBoundary-error\">"+message+"</label>");
|
||||
flag=false;
|
||||
}
|
||||
if(minTtl>maxTtl){
|
||||
message="<spring:message code='max_shouldnot_less_than_min'/>";
|
||||
$("div[for=upBoundary]").html("<label for=\"upBoundary\" class=\"error\" id=\"upBoundary-error\">"+message+"</label>");
|
||||
flag=false;
|
||||
}
|
||||
if(flag){
|
||||
//将disable属性的元素删除
|
||||
$(".disabled").each(function(){
|
||||
@@ -202,7 +216,8 @@ var delContent = function(contentClassName, addBtnClassName) {
|
||||
</c:if>
|
||||
<c:set var="ipCfgIndex" value="0"></c:set>
|
||||
<c:set var="complexCfgIndex" value="0"></c:set>
|
||||
<c:set var="stfCfgIndex" value="0"></c:set>
|
||||
<c:set var="strCfgIndex" value="0"></c:set>
|
||||
<c:set var="numCfgIndex" value="0"></c:set>
|
||||
<c:forEach items="${regionList}" var="region" varStatus="status">
|
||||
|
||||
<c:if test="${region.regionType eq 1 }">
|
||||
@@ -306,7 +321,7 @@ var delContent = function(contentClassName, addBtnClassName) {
|
||||
onClick="addContent(this,'${tabName}')" title="add"></span></small>
|
||||
</h4>
|
||||
<c:set var="cfgName"
|
||||
value="strList[${stfCfgIndex}]"></c:set>
|
||||
value="strList[${strCfgIndex}]"></c:set>
|
||||
<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
|
||||
<c:choose>
|
||||
<c:when test="${fn:length(_cfg.strList)>0}">
|
||||
@@ -324,8 +339,8 @@ var delContent = function(contentClassName, addBtnClassName) {
|
||||
<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
|
||||
</div>
|
||||
<c:set var="isBreak" value="true"></c:set>
|
||||
<c:set var="stfCfgIndex"
|
||||
value="${stfCfgIndex+1 }"></c:set>
|
||||
<c:set var="strCfgIndex"
|
||||
value="${strCfgIndex+1 }"></c:set>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</c:forEach>
|
||||
@@ -334,8 +349,8 @@ var delContent = function(contentClassName, addBtnClassName) {
|
||||
class="row boxSolid ${tabName}${status.index} hidden disabled">
|
||||
<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
|
||||
</div>
|
||||
<c:set var="stfCfgIndex"
|
||||
value="${stfCfgIndex+1 }"></c:set>
|
||||
<c:set var="strCfgIndex"
|
||||
value="${strCfgIndex+1 }"></c:set>
|
||||
</c:if>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
@@ -347,7 +362,61 @@ var delContent = function(contentClassName, addBtnClassName) {
|
||||
<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
|
||||
<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
|
||||
</div>
|
||||
<c:set var="stfCfgIndex" value="${stfCfgIndex+1 }"></c:set>
|
||||
<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
<c:if test="${region.regionType eq 4 }">
|
||||
<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
|
||||
<h4 class="form-section">
|
||||
<spring:message code="${region.configRegionValue}" />
|
||||
<small> <span
|
||||
class="glyphicon glyphicon-plus ${tabName}Add <c:if test="${fn:length(regionList)==1 or status.index==0}"> hidden</c:if>"
|
||||
onClick="addContent(this,'${tabName}')" title="add"></span></small>
|
||||
</h4>
|
||||
<c:set var="cfgName"
|
||||
value="numCfgList[${numCfgIndex}]"></c:set>
|
||||
<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
|
||||
<c:choose>
|
||||
<c:when test="${fn:length(_cfg.numCfgList)>0}">
|
||||
<c:set var="isBreak" value="false"></c:set>
|
||||
<c:forEach items="${_cfg.numCfgList}" var="cfg">
|
||||
<c:choose>
|
||||
<c:when
|
||||
test="${region.configRegionCode eq cfg.cfgRegionCode and !isBreak}">
|
||||
|
||||
<div
|
||||
class="row boxSolid ${tabName}${status.index}">
|
||||
<%@include file="/WEB-INF/views/cfg/numCfgForm.jsp"%>
|
||||
<input type="hidden" name="cfgRegionValue" value="${region.configRegionValue }">
|
||||
<input type="hidden" name="cfgRegionType" value="${region.regionType }">
|
||||
<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
|
||||
</div>
|
||||
<c:set var="isBreak" value="true"></c:set>
|
||||
<c:set var="numCfgIndex"
|
||||
value="${numCfgIndex+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/numCfgForm.jsp"%>
|
||||
</div>
|
||||
<c:set var="numCfgIndex"
|
||||
value="${numCfgIndex+1 }"></c:set>
|
||||
</c:if>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
|
||||
<div
|
||||
class="row boxSolid ${tabName}${status.index} <c:if test="${fn:length(regionList)>1 and status.index>0}"> hidden disabled</c:if>">
|
||||
<input type="hidden" name="cfgRegionValue" value="${region.configRegionValue }">
|
||||
<input type="hidden" name="cfgRegionType" value="${region.regionType }">
|
||||
<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
|
||||
<%@include file="/WEB-INF/views/cfg/numCfgForm.jsp"%>
|
||||
</div>
|
||||
<c:set var="numCfgIndex" value="${numCfgIndex+1 }"></c:set>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
|
||||
<div id="${region.regionValue}_${regionStatus.index}Title${index}" onclick="switchSubCfgTabInfo('${region.regionValue}_${regionStatus.index}',${index})"
|
||||
class="col-md-1 tabInfo" name="tabTitle${index }">
|
||||
<spring:message code='${region.regionValue}_${regionStatus.index}' />
|
||||
<spring:message code='${region.regionValue}' /><%-- _${regionStatus.index} --%>
|
||||
<i id="${region.regionValue}_${regionStatus.index}${index}" class="fa" name="tabFlag${index}"></i>
|
||||
</div>
|
||||
</c:forEach>
|
||||
@@ -357,6 +357,24 @@
|
||||
</div>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<c:if test="${region.regionType eq 4 }">
|
||||
<c:forEach items="${region.numCfgList}" var="cfg">
|
||||
<div id="${region.regionValue}_${regionStatus.index}Info${index}" class="content content${region[0]}" name="subCfg${index}">
|
||||
<div class="row">
|
||||
<div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label><spring:message code='min' />: ${cfg.lowBoundary }</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-2">
|
||||
<div class="form-group">
|
||||
<label><spring:message code='max' />: ${cfg.upBoundary}</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
|
||||
|
||||
|
||||
83
src/main/webapp/WEB-INF/views/cfg/numCfgForm.jsp
Normal file
83
src/main/webapp/WEB-INF/views/cfg/numCfgForm.jsp
Normal file
@@ -0,0 +1,83 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<html>
|
||||
<head>
|
||||
<title></title>
|
||||
|
||||
</head>
|
||||
<%-- <c:forEach items="${regionList}" var="regionDistrict">
|
||||
<c:if
|
||||
test="${cfg.functionId eq regionDistrict.functionId
|
||||
and regionDistrict.regionType eq 3
|
||||
and regionValue eq regionDistrict.configRegionValue}"> --%>
|
||||
<!-- regionDistrict.regionType==3表示增强字符串类配置 -->
|
||||
<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
|
||||
<input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
|
||||
<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
|
||||
<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
|
||||
<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
|
||||
<%-- </c:if>
|
||||
</c:forEach> --%>
|
||||
|
||||
<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>
|
||||
<c:if test="${!empty region.configDistrict }">
|
||||
<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="district" /></label>
|
||||
<div class="col-md-6">
|
||||
<select name="${cfgName}.district"
|
||||
class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
|
||||
<c:forEach items="${fn:split(region.configDistrict,',')}"
|
||||
var="_district">
|
||||
<option value="${_district }"
|
||||
<c:if test="${cfg.district==_district}">selected</c:if>>${_district }</option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
<input type="hidden" name="${cfgName}.districtShowName" maxlength="64" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control invisibleChar" value="${cfg.district}"/>
|
||||
</div>
|
||||
<div for="${cfgName}.districtShowName"></div>
|
||||
<div for="${cfgName}.district"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<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="min_tcp"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required number" type="text" name="${cfgName}.lowBoundary" value="${cfg.lowBoundary}" min="0">
|
||||
</div>
|
||||
<div for="${cfgName}.lowBoundary"></div>
|
||||
<div for="lowBoundary"></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="max_tcp"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required number" type="text" name="${cfgName}.upBoundary" value="${cfg.upBoundary}" min="0">
|
||||
</div>
|
||||
<div for="${cfgName}.upBoundary"></div>
|
||||
<div for="upBoundary"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</html>
|
||||
<script type="text/javascript">
|
||||
function changeDistrict(obj){
|
||||
if("others"==obj.val()){
|
||||
obj.parent().siblings(".otherValue").prop("type","text");
|
||||
}else{
|
||||
obj.parent().siblings(".otherValue").prop("type","hidden");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -27,7 +27,7 @@ $(function(){
|
||||
<div class="page-content">
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="spoofing_ip_pool"></spring:message>
|
||||
<spring:message code="spoofing_ip_object"></spring:message>
|
||||
</h3>
|
||||
|
||||
<div class="row">
|
||||
@@ -51,6 +51,7 @@ $(function(){
|
||||
<input type="hidden" name="protocol" value="0">
|
||||
<input type="hidden" name="port" value="0">
|
||||
<input type="hidden" name="userRegion" value="0">
|
||||
<input type="hidden" name="isAreaEffective" value="0">
|
||||
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
|
||||
<!-- 配置域类型 -->
|
||||
<c:forEach items="${regionList}" var="region">
|
||||
@@ -153,7 +154,7 @@ $(function(){
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
|
||||
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> --%>
|
||||
<br>
|
||||
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
|
||||
</div>
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
</div>
|
||||
|
||||
<h3 class="page-title">
|
||||
<spring:message code="spoofing_ip_pool"></spring:message>
|
||||
<spring:message code="spoofing_ip_object"></spring:message>
|
||||
</h3>
|
||||
<h5 class="page-header"></h5>
|
||||
<div class="col-md-12">
|
||||
|
||||
Reference in New Issue
Block a user