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

解决问题：

Browse Source 
0000022
基本配置-特征作用域
新增、修改界面，取消设置上级配置

0000021
基本配置-协议IP配置
数据列表界面：”协议id“一列显示为协议名称
数据列表界面：查询条件区域，协议id下拉列表改为协议名称下拉列表，源IP地址和目的IP地址改为输入框；
新增/修改界面：协议id改为协议名称，下拉列表选择有效协议名称；
新增/修改界面：源ip/目的ip掩码，源端口/目的端口掩码 缺省值在后台添加入库，用户填写时为非必填项


删除列表序列号，
This commit is contained in:
zhangshilin
2018-03-22 18:22:09 +08:00
parent 7ffdb1c002
commit 2d132d2b02
14 changed files with 147 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
View File

@@ -7,37 +7,46 @@
<script type="text/javascript" src="${ctxStatic}/pages/scripts/dict.js"></script>
<title></title>
<script type="text/javascript">
function sjfdsj(){
$("label[for='specServiceId']").hide();
}
$(document).ready(function() {
$("[data-toogle='tooltip']").tooltip();
$("select[name='ipType']").on("change",function(){
var type=$(this).val();
if(4==type){
$("input[name='srcIpMask']").attr("placeholder","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
$("input[name='dstIpMask']").attr("placeholder","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
$("input[name='srcIp']").attr("placeholder","任意ip请填0.0.0.0");
$("input[name='dstIp']").attr("placeholder","任意ip请填0.0.0.0");
$("input[name='srcIpMask']").attr("title","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
$("input[name='dstIpMask']").attr("title","任意掩码请填0.0.0.0,无掩码请填255.255.255.255");
$("input[name='srcIp']").attr("title","任意ip请填0.0.0.0");
$("input[name='dstIp']").attr("title","任意ip请填0.0.0.0");
$("input[name='srcIpMask']").attr("placeholder","任意ip掩码请填 0.0.0.0");
$("input[name='dstIpMask']").attr("placeholder","任意ip掩码请填 0.0.0.0");
//$("input[name='srcIp']").attr("placeholder","任意ip请填 0.0.0.0");
//$("input[name='dstIp']").attr("placeholder","任意ip请填 0.0.0.0");
$("input[name='srcIpMask']").attr("title","任意掩码请填 0.0.0.0");
$("input[name='dstIpMask']").attr("title","任意掩码请填 0.0.0.0");
//$("input[name='srcIp']").attr("title","任意ip请填 0.0.0.0");
//$("input[name='dstIp']").attr("title","任意ip请填 0.0.0.0");
}
if(6==type){
$("input[name='srcIpMask']").attr("placeholder","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
$("input[name='dstIpMask']").attr("placeholder","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
$("input[name='srcIp']").attr("placeholder","任意ip请填 ::");
$("input[name='dstIp']").attr("placeholder","任意ip请填 ::");
$("input[name='srcIpMask']").attr("title","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
$("input[name='dstIpMask']").attr("title","若无请填FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF,任意请填 ::");
$("input[name='srcIp']").attr("title","任意ip请填 ::");
$("input[name='dstIp']").attr("title","任意ip请填 ::");
$("input[name='srcIpMask']").attr("placeholder","任意ip掩码请填 ::");
$("input[name='dstIpMask']").attr("placeholder","任意ip掩码请填 ::");
//$("input[name='srcIp']").attr("placeholder","任意ip请填 0.0.0.0");
//$("input[name='dstIp']").attr("placeholder","任意ip请填 0.0.0.0");
$("input[name='srcIpMask']").attr("title","任意ip掩码请填 ::");
$("input[name='dstIpMask']").attr("title","任意ip掩码请填 ::");
//$("input[name='srcIp']").attr("title","任意ip请填 0.0.0.0");
//$("input[name='dstIp']").attr("title","任意ip请填 0.0.0.0");
}
});
jQuery.validator.addMethod("maxValue",
function(value, element) {
return value >= 0 && value < 210000000;
}, "请填写正确的协议id");
//specServiceId校验
jQuery.validator.addMethod("specServiceIdSelected",function(value, element) {
var selectedValue=$(".filter-option").text();
if(selectedValue=="--请选择协议名称--"){
return false;
}else{
return true;
}
}, "请选择协议名称");
//ip地址校验
jQuery.validator.addMethod("ip",function(value, element) {
if(value.length==0||value.trim().length==0){return true;}
var typeInt=$("select[name='ipType']").val();
if(typeInt==4){
return this.optional(element)||(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256));
@@ -46,6 +55,7 @@
}}, "请填写正确的IP地址");
//ip地址掩码校验
jQuery.validator.addMethod("ipMask",function(value, element) {
if(value.length==0||value.trim().length==0){return true;}
obj=value;
var typeInt=$("select[name='ipType']").val();
if(typeInt==4){
@@ -68,24 +78,24 @@
{
rules : {
specServiceId:{
required:true,
digits:true,
maxValue:true
specServiceIdSelected:true
},
protocol:{
required:true
},
ipType:{
required:true
},
srcIp:{
required:true,
ip:true
},
dstIp:{
required:true,
ip:true
},
srcIpMask:{
required:true,
ipMask:true
},
dstIpMask:{
required:true,
ipMask:true
},
srcPort:{
@@ -101,13 +111,11 @@
min: 0
},
srcPortMask:{
required:true,
digits:true,
max: 65535,
min: 0
},
dstPortMask:{
required:true,
digits:true,
max: 65535,
min: 0
@@ -115,23 +123,25 @@
},
messages : {
specServiceId:{
required:'<spring:message code="required"/>',
digits:'请填写整数数值',
maxValue:'请填写合适的值（0~210000000）'
specServiceIdSelected:'<spring:message code="required"/>'
},
protocol:{
required:'<spring:message code="required"/>'
},
ipType:{
required:'<spring:message code="required"/>'
},
srcIp:{
required:'<spring:message code="required"/>',
ip:'请填写正确的ip'
},
dstIp:{
required:'<spring:message code="required"/>',
ip:'请填写正确的ip'
},
srcIpMask:{
required:'<spring:message code="required"/>'
ipMask:'请填写正确的ip掩码'
},
dstIpMask:{
required:'<spring:message code="required"/>'
ipMask:'请填写正确的ip掩码'
},
srcPort:{
required:'<spring:message code="required"/>',
@@ -146,13 +156,11 @@
min: '数值不得小于0'
},
srcPortMask:{
required:'<spring:message code="required"/>',
digits:'请填写整数',
max: '数值不得大于65535',
min: '数值不得小于0'
},
dstPortMask:{
required:'<spring:message code="required"/>',
digits:'请填写整数',
max: '数值不得大于65535',
min: '数值不得小于0'
@@ -227,17 +235,26 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>协议ID:</label>
<div class="col-md-6">
<form:input path="specServiceId" htmlEscape="false" maxlength="50" class="form-control" />
</div>
<label class="col-md-3 control-label"><font color="red">*</font>协议名称:</label>
<c:set var="spec_service_id">--请选择协议名称--</c:set>
<form:select path="specServiceId" class="selectpicker select2 col-md-6" title="${spec_service_id}" data-live-search="true" data-live-search-placeholder="search" onchange="sjfdsj()">
<c:forEach items="${listSpecService}" var="specService" >
<form:option value="${specService.specServiceId}">${specService.specServiceName}</form:option>
</c:forEach>
</form:select>
<!-- <label class="col-md-3 control-label dfdf" > </label>
<div class="col-md-6 dfdf">
<label class="error">不能为空!</label>
</div> -->
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>方向:</label>
<label class="col-md-3 control-label">方向:</label>
<div class="col-md-6">
<form:select path="direction" class="selectpicker select2 form-control" >
<form:select path="direction" class="select2 form-control" >
<form:option value="">-请选择方向-</form:option>
<c:forEach items="${fns:getDictList('SPEC_DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
</c:forEach>
@@ -252,7 +269,8 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>协议:</label>
<div class="col-md-6">
<form:select path="protocol" class="selectpicker select2 form-control" >
<form:select path="protocol" class="select2 form-control" >
<form:option value="">-请选择协议-</form:option>
<c:forEach items="${fns:getDictList('SPEC_PROTOCOL')}" var="dict">
<form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
</c:forEach>
@@ -264,7 +282,8 @@
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>ip类型:</label>
<div class="col-md-6">
<form:select path="ipType" class="selectpicker select2 form-control" >
<form:select path="ipType" class="select2 form-control" >
<form:option value="">-请选择ip类型-</form:option>
<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
<form:option value="${dict.itemCode}">${dict.itemValue}</form:option>
</c:forEach>
@@ -280,17 +299,17 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>源IP地址:</label>
<label class="col-md-3 control-label">源IP地址:</label>
<div class="col-md-6">
<form:input path="srcIp" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip请填0.0.0.0" placeholder="任意ip请填0.0.0.0"/>
<form:input path="srcIp" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip请填 0.0.0.0" placeholder="任意ip请填 0.0.0.0"/>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>目的IP地址:</label>
<label class="col-md-3 control-label">目的IP地址:</label>
<div class="col-md-6">
<form:input path="dstIp" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip请填0.0.0.0" placeholder="任意ip请填0.0.0.0"/>
<form:input path="dstIp" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip请填 0.0.0.0" placeholder="任意ip请填 0.0.0.0"/>
</div>
</div>
</div>
@@ -299,17 +318,17 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>源地址掩码:</label>
<label class="col-md-3 control-label">源地址掩码:</label>
<div class="col-md-6">
<form:input path="srcIpMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" title="任意掩码请填0.0.0.0,无掩码请填255.255.255.255" data-placement="top" placeholder="任意掩码请填0.0.0.0,无掩码请填255.255.255.255"/>
<form:input path="srcIpMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" title="任意ip掩码请填 0.0.0.0" data-placement="top" placeholder="任意ip掩码请填 0.0.0.0"/>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>目的地址掩码:</label>
<label class="col-md-3 control-label">目的地址掩码:</label>
<div class="col-md-6">
<form:input path="dstIpMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0.0.0.0,无掩码请填255.255.255.255" placeholder="任意掩码请填0.0.0.0,无掩码请填255.255.255.255"/>
<form:input path="dstIpMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意ip掩码请填 0.0.0.0" placeholder="任意ip掩码请填 0.0.0.0"/>
</div>
</div>
</div>
@@ -336,17 +355,17 @@
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>源端口掩码:</label>
<label class="col-md-3 control-label">源端口掩码:</label>
<div class="col-md-6">
<form:input path="srcPortMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0,无掩码请填65535" placeholder="任意掩码请填0,无掩码请填65535"/>
<form:input path="srcPortMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0" placeholder="任意掩码请填0"/>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>目的端口掩码:</label>
<label class="col-md-3 control-label">目的端口掩码:</label>
<div class="col-md-6">
<form:input path="dstPortMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0,无掩码请填65535" placeholder="任意掩码请填0,无掩码请填65535"/>
<form:input path="dstPortMask" htmlEscape="false" maxlength="50" class="form-control" data-toggle="tooltip" data-placement="top" title="任意掩码请填0" placeholder="任意掩码请填0"/>
</div>
</div>
</div>