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

修改获取来函调用的方法，IP类配置加入非空验证

Browse Source
This commit is contained in:
wangxin
2018-03-06 19:00:08 +08:00
parent b21c159fdd
commit 9e32bbdb23
8 changed files with 64 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/webapp/WEB-INF/include/form/basicInfo.jsp
View File

@@ -6,7 +6,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">来函</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="requestId" data-live-search="true" data-live-search-placeholder="搜索" class="selectpicker form-control" title="--请选择--">
<c:forEach items="${requestInfos}" var="requestInfo">
<option value="${requestInfo.id}"
@@ -15,13 +15,14 @@
</c:forEach>
</select>
</div>
<div for="requestId"></div>
</div>
</div>
<!--/span-->
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">分类</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="classify" multiple class="selectpicker form-control" title="--请选择--">
<c:forEach items="${fls}" var="fl">
<c:choose>
@@ -55,7 +56,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">性质</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="attribute" multiple class="selectpicker form-control" title="--请选择--">
<c:forEach items="${xzs}" var="xz">
<c:choose>
@@ -79,7 +80,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">标签</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="lable" multiple class="selectpicker form-control" title="--请选择--">
<c:forEach items="${lables}" var="lable">
<c:choose>
@@ -108,7 +109,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">生效范围</label>
<div class="col-md-8">
<div class="col-md-6">
<select class="form-control">
<option>Country 1</option>
<option>Country 2</option>

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

@@ -5,21 +5,23 @@
<div class="col-md-6">
<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="${_cfg.cfgDesc}">
<div class="col-md-6">
<input class="form-control" type="text" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
</div>
<div for="cfgDesc"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<div class="form-group">
<label class="control-label col-md-3">ip类型</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="ipType" class="selectpicker show-tick form-control" title="--请选择--">
<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="${_cfg.ipType}">-->
</div>
<div for="ipType"></div>
</div>
</div>
</div>
@@ -27,17 +29,19 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">源IP地址</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="srcIp" value="${_cfg.srcIp}">
</div>
<div for="srcIp"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">源地址掩码</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="srcIpMask" value="${_cfg.srcIpMask}">
</div>
<div for="srcIpMask"></div>
</div>
</div>
</div>
@@ -45,17 +49,19 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">源端口</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="srcPort" value="${_cfg.srcPort}">
</div>
<div for="srcPort"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">源端口掩码</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="srcPortMask" value="${_cfg.srcPortMask}">
</div>
<div for="srcPortMask"></div>
</div>
</div>
</div>
@@ -63,17 +69,19 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">目的IP地址</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="dstIp" value="${_cfg.dstIp}">
</div>
<div for="dstIp"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">目的地址掩码</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="dstIpMask" value="${_cfg.dstIpMask}">
</div>
<div for="dstIpMask"></div>
</div>
</div>
</div>
@@ -81,17 +89,19 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">目的端口</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="dstPort" value="${_cfg.dstPort}">
</div>
<div for="dstPort"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">目的端口掩码</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="dstPortMask" value="${_cfg.dstPortMask}">
</div>
<div for="dstPortMask"></div>
</div>
</div>
</div>
@@ -99,19 +109,20 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">方向</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="direction" class="selectpicker show-tick form-control" title="--请选择--">
<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="${_cfg.direction}"> --%>
</div>
<div for="direction"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">协议</label>
<div class="col-md-8">
<div class="col-md-6">
<select name="protocol" class="selectpicker show-tick form-control" title="--请选择--">
<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>
@@ -119,6 +130,7 @@
</select>
<%-- <input class="form-control" type="text" name="protocol" value="${_cfg.protocol}"> --%>
</div>
<div for="protocol"></div>
</div>
</div>
</div>
@@ -126,15 +138,15 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">协议ID</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="protocolId" value="${_cfg.protocolId}" readonly="readonly">
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">管控类型</label>
<div class="col-md-8">
<label class="control-label col-md-3">管控类型</div>
<div class="col-md-6">
<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>
@@ -152,7 +164,7 @@
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3">是否区域管控</label>
<div class="col-md-8">
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isAreaEffective" value="1"
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
@@ -165,14 +177,16 @@
</label>
<%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
</div>
<div for="isAreaEffective"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">区域生效id</label>
<div class="col-md-8">
<div class="col-md-6">
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
</div>
<div for="areaEffectiveIds"></div>
</div>
</div>
</div>

2
src/main/webapp/WEB-INF/include/form/stringInfo.jsp
View File

@@ -61,7 +61,7 @@
<label class="control-label col-md-3">表达式类型</label>
<div class="col-md-8">
<label class="radio-inline">
<input type="radio" name="exprType " value="1"
<input type="radio" name="exprType" value="1"
<c:if test="${_cfg.exprType==1}">checked</c:if>
>与表达式
</label>

14
src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
View File

@@ -5,6 +5,20 @@
<title><spring:message code="${cfgName}"></spring:message></title>
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
<c:choose>
<c:when test="${cookie.Language.value eq 'zh_CN'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'en'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:when>
<c:when test="${cookie.Language.value eq 'ru_RU'}">
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
</c:when>
<c:otherwise>
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
</c:otherwise>
</c:choose>
<script>
$(document).ready(function() {