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

(1)提交通用字符串类的配置controller,service,dao,界面

Browse Source 
(2)修复通用IP类配置的部分bug
(3)调整列表显示顺序，将创建人，创建时间等后移
This commit is contained in:
wangxin
2018-02-27 15:31:30 +08:00
parent ca8a6dcdf9
commit 2103d3abf0
15 changed files with 1560 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/webapp/WEB-INF/include/form/ipInfo.jsp
View File

@@ -6,7 +6,7 @@
<div class="form-group">
<label class="control-label col-md-3">配置描述</label>
<div class="col-md-8">
<input class="form-control" type="text" name="cfgDesc" value="${_ipCfg.cfgDesc}">
<input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
</div>
</div>
@@ -15,10 +15,10 @@
<label class="control-label col-md-3">ip类型</label>
<div class="col-md-8">
<select name="ipType" class="selectpicker show-tick form-control" title="--请选择--">
<option value="4" <c:if test="${_ipCfg.ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_ipCfg.ipType==6}">selected</c:if>>V6</option>
<option value="4" <c:if test="${_cfg.ipType==4}">selected</c:if> >V4</option>
<option value="6" <c:if test="${_cfg.ipType==6}">selected</c:if>>V6</option>
</select>
<!-- <input class="form-control" type="text" value="${_ipCfg.ipType}">-->
<!-- <input class="form-control" type="text" value="${_cfg.ipType}">-->
</div>
</div>
</div>
@@ -28,7 +28,7 @@
<div class="form-group">
<label class="control-label col-md-3">源IP地址</label>
<div class="col-md-8">
<input class="form-control" type="text" name="srcIp" value="${_ipCfg.srcIp}">
<input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
</div>
</div>
</div>
@@ -36,7 +36,7 @@
<div class="form-group ">
<label class="control-label col-md-3">源地址掩码</label>
<div class="col-md-8">
<input class="form-control" type="text" name="srcIpMask" value="${_ipCfg.srcIpMask}">
<input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
</div>
</div>
</div>
@@ -46,7 +46,7 @@
<div class="form-group">
<label class="control-label col-md-3">源端口</label>
<div class="col-md-8">
<input class="form-control" type="text" name="srcPort" value="${_ipCfg.srcPort}">
<input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
</div>
</div>
</div>
@@ -54,7 +54,7 @@
<div class="form-group ">
<label class="control-label col-md-3">源端口掩码</label>
<div class="col-md-8">
<input class="form-control" type="text" name="srcPortMask" value="${_ipCfg.srcPortMask}">
<input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
</div>
</div>
</div>
@@ -64,7 +64,7 @@
<div class="form-group">
<label class="control-label col-md-3">目的IP地址</label>
<div class="col-md-8">
<input class="form-control" type="text" name="dstIp" value="${_ipCfg.dstIp}">
<input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
</div>
</div>
</div>
@@ -72,7 +72,7 @@
<div class="form-group ">
<label class="control-label col-md-3">目的地址掩码</label>
<div class="col-md-8">
<input class="form-control" type="text" name="dstIpMask" value="${_ipCfg.dstIpMask}">
<input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
</div>
</div>
</div>
@@ -82,7 +82,7 @@
<div class="form-group">
<label class="control-label col-md-3">目的端口</label>
<div class="col-md-8">
<input class="form-control" type="text" name="dstPort" value="${_ipCfg.dstPort}">
<input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
</div>
</div>
</div>
@@ -90,7 +90,7 @@
<div class="form-group ">
<label class="control-label col-md-3">目的端口掩码</label>
<div class="col-md-8">
<input class="form-control" type="text" name="dstPortMask" value="${_ipCfg.dstPortMask}">
<input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
</div>
</div>
</div>
@@ -101,10 +101,10 @@
<label class="control-label col-md-3">方向</label>
<div class="col-md-8">
<select name="direction" class="selectpicker show-tick form-control" title="--请选择--">
<option value="0" <c:if test="${_ipCfg.direction==0}">selected</c:if>>0</option>
<option value="1" <c:if test="${_ipCfg.direction==1}">selected</c:if>>1</option>
<option value="0" <c:if test="${_cfg.direction==0}">selected</c:if>>0</option>
<option value="1" <c:if test="${_cfg.direction==1}">selected</c:if>>1</option>
</select>
<%-- <input class="form-control" type="text" name="direction" value="${_ipCfg.direction}"> --%>
<%-- <input class="form-control" type="text" name="direction" value="${_cfg.direction}"> --%>
</div>
</div>
</div>
@@ -113,11 +113,11 @@
<label class="control-label col-md-3">协议</label>
<div class="col-md-8">
<select name="protocol" class="selectpicker show-tick form-control" title="--请选择--">
<option value="6" <c:if test="${_ipCfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_ipCfg.protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${_ipCfg.protocol==0}">selected</c:if>>任意</option>
<option value="6" <c:if test="${_cfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_cfg.protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${_cfg.protocol==0}">selected</c:if>>任意</option>
</select>
<%-- <input class="form-control" type="text" name="protocol" value="${_ipCfg.protocol}"> --%>
<%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
</div>
</div>
</div>
@@ -127,7 +127,7 @@
<div class="form-group">
<label class="control-label col-md-3">协议ID</label>
<div class="col-md-8">
<input class="form-control" type="text" name="protocolId" value="${_ipCfg.protocolId}" readonly="readonly">
<input class="form-control" type="text" name="protocolId" value="${_cfg.protocolId}" readonly="readonly">
</div>
</div>
</div>
@@ -135,7 +135,15 @@
<div class="form-group ">
<label class="control-label col-md-3">管控类型</label>
<div class="col-md-8">
<input class="form-control" type="text" name="action" value="${_ipCfg.action}" readonly="readonly">
<select name="action" class="selectpicker select2 form-control" readonly="readonly">
<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
<option value="5" <c:if test="${_cfg.action==5}">selected</c:if><c:if test="${_cfg.action!=5}">disabled="disabled"</c:if> >封堵白名单</option>
<option value="6" <c:if test="${_cfg.action==6}">selected</c:if><c:if test="${_cfg.action!=6}">disabled="disabled"</c:if> >监测白名单</option>
<option value="7" <c:if test="${_cfg.action==7}">selected</c:if><c:if test="${_cfg.action!=7}">disabled="disabled"</c:if> >封堵监测都白名单</option>
<option value="8" <c:if test="${_cfg.action==8}">selected</c:if><c:if test="${_cfg.action!=8}">disabled="disabled"</c:if> >灰名单</option>
</select>
<%-- <input class="form-control" type="hidden" name="action" value="${_cfg.action}"> --%>
</div>
</div>
</div>
@@ -145,7 +153,7 @@
<div class="form-group">
<label class="control-label col-md-3">有效标识</label>
<div class="col-md-8">
<input class="form-control" type="text" name="isValid" value="${_ipCfg.isValid}">
<input class="form-control" type="text" name="isValid" value="${_cfg.isValid}">
</div>
</div>
</div>
@@ -155,12 +163,12 @@
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="isAudit" value="1"
<c:if test="${_ipCfg.isAudit==1}"></c:if>
<c:if test="${_cfg.isAudit==1}"></c:if>
>是
</label>
<label class="radio-inline">
<input type="radio" name="isAudit" value="0"
<c:if test="${_ipCfg.isAudit==0}"></c:if>
<c:if test="${_cfg.isAudit==0}"></c:if>
>否
</label>
</div>
@@ -174,15 +182,15 @@
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_ipCfg.isAreaEffective==1}">checked</c:if>
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
>是
</label>
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="0"
<c:if test="${_ipCfg.isAreaEffective==0}">checked</c:if>
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
>否
</label>
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_ipCfg.isAreaEffective}"> --%>
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
</div>
</div>
</div>
@@ -190,7 +198,7 @@
<div class="form-group ">
<label class="control-label col-md-3">区域生效id</label>
<div class="col-md-8">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_ipCfg.areaEffectiveIds}">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>
</div>
</div>