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

协议IP表结构变更,修改协议IP管理功能。

Browse Source
This commit is contained in:
zhangwei
2018-06-21 18:10:07 +08:00
parent 16b4b22504
commit 7b32502349
8 changed files with 197 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
View File

@@ -7,7 +7,7 @@
var validateForm;
$(document).ready(function() {
//校验叶子节点有下级不得更改为叶子节点
jQuery.validator.addMethod("leafChange",function(value,element){
/* jQuery.validator.addMethod("leafChange",function(value,element){
var flagLeafChange=false;
$.ajax({
type:'post',
@@ -19,7 +19,7 @@
}
});
return flagLeafChange;
},"<spring:message code='leafChange'/>");
},"<spring:message code='leafChange'/>"); */
$("#name").focus();
validateForm = $("#inputForm").validate({
@@ -99,7 +99,7 @@
<div class="col-md-4">
<c:set var="fatherName"><spring:message code="root_node"/></c:set>
<sys:treeselect id="specificServiceCfg" name="parent.specServiceId" value="${specificServiceCfg.parent.specServiceId}" labelName="parent.specServiceName" labelValue="${specificServiceCfg.parent.specServiceId eq '0'?fatherName:fns:getBySpecServiceId(specificServiceCfg.parent.specServiceId).specServiceName}"
title="" url="/specific/specificServiceCfg/treeData" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>
title="" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId="${specificServiceCfg.specServiceId}" cssClass="required form-control"/>
</div>
</div>
<div class="form-group">
@@ -120,7 +120,7 @@
<form:input path="groupId" htmlEscape="false" maxlength="50" range="[0,2147483647]" class="form-control digits" placeholder="0"/>
</div>
</div>
<div class="form-group">
<%-- <div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<form:select path="isLeaf" class="form-control leafChange">
@@ -129,7 +129,7 @@
</c:forEach>
</form:select>
</div>
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="protocol_desc"/>:</label>
<div class="col-md-4">

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

@@ -2,8 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<link rel="stylesheet" type="text/css"
href="${ctxStatic}/pages/css/dictInfo.css" />
<script type="text/javascript">
var validateForm;
function selectP(){
@@ -88,7 +87,6 @@ function selectP(){
<h3 class="page-title">
<spring:message code="agreement_ip_configuration" />
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
@@ -99,13 +97,10 @@ function selectP(){
</div>
<div class="tools"></div>
</div>
<div class="portlet-body form">
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="specificServiceHostCfg" action="${ctx}/specific/specificServiceHostCfg/saveOrUpdate" method="post" class="form-horizontal" >
<div class="form-body row">
<form:hidden path="hostId" class="form-control" />
<sys:message content="${message}" />
<div class="row">
@@ -113,15 +108,14 @@ function selectP(){
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol_name' />:</label>
<c:set var="spec_service_id"><spring:message code='select' /></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="selectP()">
<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 class="col-md-6">
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty specificServiceHostCfg.specServiceId?spec_service_id:fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
cssClass="form-control required"/>
</div>
</div>
</div>
@@ -129,9 +123,9 @@ function selectP(){
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='direction' />:</label>
<div class="col-md-6">
<form:select path="direction" class="select2 form-control" >
<form:select path="direction" class="select2 form-control required" >
<form:option value=""><spring:message code='select' /></form:option>
<c:forEach items="${fns:getDictList('SPEC_DIRECTION')}" var="dict">
<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
</c:forEach>
</form:select>
@@ -147,7 +141,7 @@ function selectP(){
<div class="col-md-6">
<form:select path="protocol" class="select2 form-control required" >
<form:option value=""><spring:message code='select' /></form:option>
<c:forEach items="${fns:getDictList('SPEC_PROTOCOL')}" var="dict">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
</c:forEach>
</form:select>
@@ -159,8 +153,7 @@ function selectP(){
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='ip_type' />:</label>
<div class="col-md-6">
<form:select path="ipType" class="select2 form-control required" >
<%-- <form:option value=""><spring:message code='select' /></form:option> --%>
<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
</c:forEach>
</form:select>
@@ -171,22 +164,26 @@ function selectP(){
</div>
</div>
</div>
<c:set var="arbitraryValue"><spring:message code='arbitrary'/> : 0.0.0.0</c:set>
<c:set var="arbitraryPort"><spring:message code='arbitrary'/> : 0</c:set>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='client_ip' />:</label>
<div class="col-md-6">
<form:input path="srcIp" htmlEscape="false" maxlength="50" class="form-control ipCheck" placeholder="${arbitraryValue}"/>
</div>
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="ip_pattern" /></label>
<div class="col-md-6">
<form:select path="ipPattern"
class="select2 form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" ><spring:message code="${ipPatternC.itemValue}"/></option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='server_ip' />:</label>
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='server_ip' />:</label>
<div class="col-md-6">
<form:input path="dstIp" htmlEscape="false" maxlength="50" class="form-control ipCheck" placeholder="${arbitraryValue}"/>
<form:input class="form-control required ipCheck" type="text" path="destIpAddress" />
</div>
</div>
</div>
@@ -195,120 +192,29 @@ function selectP(){
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='client_address_mask' />:</label>
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="port_pattern" /></label>
<div class="col-md-6">
<form:input path="srcIpMask" htmlEscape="false" maxlength="50" class="form-control ipMask" placeholder="${arbitraryValue}"/>
<form:select path="portPattern"
class="select2 form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" ><spring:message code="${portPatternC.itemValue}"/></option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='server_address_mask' />:</label>
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="server_port" /></label>
<div class="col-md-6">
<form:input path="dstIpMask" htmlEscape="false" maxlength="50" class="form-control ipMask" placeholder="${arbitraryValue}"/>
<form:input class="form-control required portCheck" type="text"
path="destPort" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='client_port' />:</label>
<div class="col-md-6">
<form:input path="srcPort" htmlEscape="false" maxlength="50" range="[0,65535]" class="form-control required digits notStartZero" placeholder="${arbitraryPort}"/>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='server_port' />:</label>
<div class="col-md-6">
<form:input path="dstPort" htmlEscape="false" maxlength="50" range="[0,65535]" class="form-control required digits notStartZero" placeholder="${arbitraryPort}"/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='client_port_mask' />:</label>
<div class="col-md-6">
<form:input path="srcPortMask" htmlEscape="false" maxlength="50" range="[0,65535]" class="form-control digits notStartZero" placeholder="${arbitraryPort}"/>
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code='server_port_mask' />:</label>
<div class="col-md-6">
<form:input path="dstPortMask" htmlEscape="false" maxlength="50" range="[0,65535]" class="form-control digits notStartZero" placeholder="${arbitraryPort}"/>
</div>
</div>
</div>
</div>
<%-- <div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>创建人员:</label>
<div class="col-md-6">
<form:input path="creator.id" htmlEscape="false" maxlength="50" class="form-control" />
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>配置时间:</label>
<div class="col-md-6">
<form:input path="createTime" htmlEscape="false" maxlength="50" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>修改人员:</label>
<div class="col-md-6">
<form:input path="editor.id" htmlEscape="false" maxlength="50" class="form-control" />
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>修改时间:</label>
<div class="col-md-6">
<form:input path="editTime" htmlEscape="false" maxlength="50" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>审核人员:</label>
<div class="col-md-6">
<form:input path="auditor.id" htmlEscape="false" maxlength="50" class="form-control" />
</div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font>审核时间:</label>
<div class="col-md-6">
<form:input path="auditTime" htmlEscape="false" maxlength="50" class="form-control" />
</div>
</div>
</div>
</div> --%>
<div class="form-actions">
<div class="row">
<div class="col-md-offset-3 col-md-9">
@@ -317,16 +223,13 @@ function selectP(){
</div>
</div>
</div>
</div>
</form:form>
<!-- END FORM-->
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

56
src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
View File

@@ -224,9 +224,9 @@
onClick="javascript:window.location='${ctx}/specific/specificServiceHostCfg/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"/></button>
<button type="button" class="btn btn-primary green" data-toggle="modal" data-target="#exampleModal" onClick="toImport();">
<%-- <button type="button" class="btn btn-primary green" data-toggle="modal" data-target="#exampleModal" onClick="toImport();">
<i class="fa fa-upload"></i>
<spring:message code="import"/></button>
<spring:message code="import"/></button> --%>
</button>
</shiro:hasPermission>
</div>
@@ -256,11 +256,12 @@
<div class="col-md-12">
<div class="pull-left">
<c:set var="spec_service_id"><spring:message code="protocol_name"/></c:set>
<form:select path="specServiceId" class="selectpicker select2 input-small" title="${spec_service_id}" data-live-search="true" data-live-search-placeholder="search" onchange="page()">
<c:forEach items="${listSpecService}" var="specService" >
<form:option value="${specService.specServiceId}">${specService.specServiceName}</form:option>
</c:forEach>
</form:select>
<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}"
labelName="parent.specServiceName"
labelValue="${empty specificServiceHostCfg.specServiceId?spec_service_id:fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName}"
title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false" extId=""
cssClass="form-control input-small"/>
</div>
<div class="pull-left" style="margin-right:0px;">
<form:select path="protocol" class="selectpicker select2 input-small" >
@@ -270,21 +271,9 @@
</c:forEach>
</form:select>
</div>
<%-- <div class="pull-left" style="margin-right:0px;">
<form:select path="ipType" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="ip_type"/></form:option>
<c:forEach items="${fns:getDictList('SPEC_IP_TYPE')}" var="dict">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:forEach>
</form:select>
</div> --%>
<div class="pull-left">
<c:set var = "condition_srcIp"><spring:message code="client_ip" /></c:set>
<form:input path="srcIp" placeholder="${condition_srcIp}" class="form-control input-small"/>
</div>
<div class="pull-left">
<c:set var = "condition_dstIp"><spring:message code="server_ip" /></c:set>
<form:input path="dstIp" placeholder="${condition_dstIp}" class="form-control input-small"/>
<form:input path="destIpAddress" placeholder="${condition_dstIp}" class="form-control input-small"/>
</div>
<div class="pull-left">
@@ -393,14 +382,9 @@
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th><spring:message code="protocol_name" /></th>
<th><spring:message code="client_ip" /></th>
<th><spring:message code="client_address_mask" /></th>
<th><spring:message code="client_port" /></th>
<th><spring:message code="client_port_mask" /></th>
<th><spring:message code="ip_type" /></th>
<th><spring:message code="server_ip" /></th>
<th><spring:message code="server_address_mask" /></th>
<th><spring:message code="server_port" /></th>
<th><spring:message code="server_port_mask" /></th>
<th><spring:message code="direction" /></th>
<th><spring:message code="protocol" /></th>
<%-- <th><spring:message code="is_audit" /></th> --%>
@@ -417,17 +401,15 @@
<tr>
<td><input type="checkbox" class="i-checks" name="check" id="${specificServiceHostCfg.hostId}" value="${specificServiceHostCfg.hostId}"></td>
<td>${fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName }</td>
<td title="${specificServiceHostCfg.srcIp}">${fns:abbr(specificServiceHostCfg.srcIp,15)}</td>
<td title="${specificServiceHostCfg.srcIpMask}">${fns:abbr(specificServiceHostCfg.srcIpMask,15) }</td>
<td>${specificServiceHostCfg.srcPort}</td>
<td>${specificServiceHostCfg.srcPortMask}</td>
<td title="${specificServiceHostCfg.dstIp}">${fns:abbr(specificServiceHostCfg.dstIp,15) }</td>
<td title="${specificServiceHostCfg.dstIpMask}">${fns:abbr(specificServiceHostCfg.dstIpMask,15) }</td>
<td>${specificServiceHostCfg.dstPort }</td>
<td>${specificServiceHostCfg.dstPortMask }</td>
<td><spring:message code='${fns:getDictLabel("SPEC_DIRECTION",specificServiceHostCfg.direction,"0")}' /></td>
<td><spring:message code='${fns:getDictLabel("SPEC_PROTOCOL",specificServiceHostCfg.protocol,"0")}' /></td>
<!--<td><spring:message code='${fns:getDictLabel("SPEC_AUDIT",specificServiceHostCfg.isAudit,"0")}' /></td> -->
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${ipType.itemCode eq specificServiceHostCfg.ipType}">${ipType.itemValue}</c:if>
</c:forEach>
</td>
<td>${specificServiceHostCfg.destIpAddress }</td>
<td>${specificServiceHostCfg.destPort }</td>
<td><spring:message code='${fns:getDictLabel("DIRECTION",specificServiceHostCfg.direction,"0")}' /></td>
<td><spring:message code='${fns:getDictLabel("PROTOCOL",specificServiceHostCfg.protocol,"0")}' /></td>
<td>${fns:getUserById(specificServiceHostCfg.creator.id).name}</td>
<td><fmt:formatDate value="${specificServiceHostCfg.createTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
<td>${fns:getUserById(specificServiceHostCfg.editor.id==null?0:specificServiceHostCfg.editor.id).name}</td>