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

DNAT复用策略增加用户和用户类型

Browse Source 
调整SNAT地址池管理 配置IP的格式为：IP sql提交
This commit is contained in:
leijun
2019-01-16 18:49:44 +08:00
parent 98971a4c32
commit d7807f0009
11 changed files with 203 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
View File

@@ -149,9 +149,10 @@ var resetIndex = function(){
<c:forEach items="${serviceList}" var="service" varStatus="satus">
<label class="radio-inline">
<c:if test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -176,6 +177,32 @@ var resetIndex = function(){
</div>
</div>
<!-- dolog begin-->
<div class="row doLog">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doLog}">
<label class="radio-inline">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div>
<!-- dolog end-->
<h4 class="form-section">
<spring:message code="address_pool_ip_configuration" />
<small>
@@ -227,7 +254,7 @@ var resetIndex = function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
@@ -371,7 +398,7 @@ var resetIndex = function(){
</div>
<div class="row ip">
<div class="col-md-6">
<div class="col-md-6 hidden" >
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">

1
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp
View File

@@ -401,7 +401,6 @@
<th column="address_pool" class="sort-column r.addr_pool_name"><spring:message code="address_pool"/></th>
<th column="ip_total" class="sort-column r.ip_total"><spring:message code="ip_total"/></th>
<th column="available_ip_total" ><spring:message code="available_ip_total"/></th>
<%-- <th column="user_name" ><spring:message code="block_type"/></th> --%>
<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th>

35
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyForm2.jsp
View File

@@ -90,7 +90,7 @@ $(function(){
</div>
</div>
<c:if test="${fn:length(serviceList)>1}">
<div class="col-md-6">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<div class="col-md-6">
@@ -201,7 +201,7 @@ $(function(){
</div>
</div>
<div class="row port">
<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="translated_dest_ip"/></label>
<div class="col-md-6">
@@ -209,7 +209,7 @@ $(function(){
</div>
<div for="destIpAddress"></div>
</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="translated_dest_port"/></label>
@@ -219,6 +219,35 @@ $(function(){
<div for="destPort"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="user_type"/></label>
<div class="col-md-6">
<select name="translatedUserType" class="selectpicker show-tick form-control required">
<%-- <option value=""><spring:message code="select"/></option> --%>
<option value="VPN" <c:if test="${_cfg.translatedUserType eq 'VPN' }">selected</c:if>><spring:message code="policy_vpn_user"/></option>
<%-- <option value="SIPv4" <c:if test="${_cfg.userType eq 'SIPv4' }">selected</c:if>><spring:message code="policy_sipv4_user"/></option>
<option value="SIPv6" <c:if test="${_cfg.userType eq 'SIPv6' }">selected</c:if>><spring:message code="policy_sipv6_user"/></option> --%>
</select>
</div>
<div for="translatedUserId"></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="user"/></label>
<div class="col-md-6">
<select name="translatedUserId" class="selectpicker show-tick form-control required user" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${users}" var="user">
<option value="${user.userName}" <c:if test="${_cfg.translatedUserId eq user.userName }">selected</c:if>><spring:message code="${user.userName}"/></option>
</c:forEach>
</select>
</div>
<div for="translatedUserType"></div>
</div>
</div>
</div>
<%-- <div class="row destPort">
<div class="col-md-6">

67
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp
View File

@@ -19,9 +19,40 @@
$("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.destPort}"){
$("#intype").val("${cfg.destPort}");
}else if("${cfg.translatedUserId}"){
$("#intype").val("${cfg.translatedUserId}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
// 处理用户类型检索条件
if($("#seltype").val() == "translatedUserType"){
$("#intype").hide();// 隐藏输入框
$("#isValid").selectpicker("hide");
}else{
$("#translatedUserType").selectpicker("hide");
}
$("#seltype").change(function(){
if($(this).val() == "translatedUserType"){
$("#intype").hide();// 隐藏输入框
$("#intype").val("");// 清空input条件
$("#translatedUserType").find("option").removeAttr("selected",false);
$("#translatedUserType").selectpicker("refresh");
$("#translatedUserType").selectpicker("show");
$("#isValid").selectpicker("hide");
}else if($(this).val() == "isValid"){
$("#translatedUserType").find("option:first").attr("selected",true);
$("#translatedUserType").selectpicker("hide");
}else{
$("#translatedUserType").find("option:first").attr("selected",true);
$("#translatedUserType").selectpicker("hide");// 隐藏下拉框
}
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
$("#seltype").change(function(){
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
});
@@ -105,8 +136,10 @@
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="original_dest_ip"></spring:message></form:option>
<form:option value="srcPort"><spring:message code="original_dest_port"></spring:message></form:option>
<form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option>
<%-- <form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option> --%>
<form:option value="destPort"><spring:message code="translated_dest_port"></spring:message></form:option>
<form:option value="translatedUserId"><spring:message code="user"></spring:message></form:option>
<%-- <form:option value="translatedUserType"><spring:message code="user_type"></spring:message></form:option> --%>
<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -126,6 +159,13 @@
<form:option value="1"><spring:message code="yes"/></form:option>
<form:option value="0"><spring:message code="no"/></form:option>
</form:select>
<form:select path="translatedUserType" class="selectpicker select2 input-small" >
<form:option value=""><spring:message code="select"/></form:option>
<form:option value="VPN"><spring:message code="policy_vpn_user"/></form:option>
<form:option value="SIPv4"><spring:message code="policy_sipv4_user"/></form:option>
<form:option value="SIPv6"><spring:message code="policy_sipv6_user"/></form:option>
</form:select>
</div>
</div>
</div>
@@ -309,9 +349,11 @@
<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th column="original_dest_ip" ><spring:message code="original_dest_ip"/></th>
<th column="original_dest_port" ><spring:message code="original_dest_port"/></th>
<th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th>
<%-- <th column="translated_dest_ip" ><spring:message code="translated_dest_ip"/></th> --%>
<th column="translated_dest_port" ><spring:message code="translated_dest_port"/></th>
<th column="protocol" ><spring:message code="protocol"/></th>
<th column="user_type"><spring:message code="user_type"/></th>
<th column="user"><spring:message code="user"/></th>
<th column="log_total" ><spring:message code="log_total"/></th>
<th column="valid_identifier" class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
@@ -348,7 +390,7 @@
</td> --%>
<td>${indexCfg.srcIpAddress }</td>
<td>${indexCfg.srcPort }</td>
<td>${indexCfg.destIpAddress }</td>
<%-- <td>${indexCfg.destIpAddress }</td> --%>
<td>${indexCfg.destPort }</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
@@ -357,6 +399,25 @@
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${indexCfg.translatedUserType eq 'VPN' }">
<spring:message code="policy_vpn_user"/>
</c:if>
<c:if test="${indexCfg.translatedUserType eq 'SIPv4' }">
<spring:message code="policy_sipv4_user"/>
</c:if>
<c:if test="${indexCfg.translatedUserType eq 'SIPv6' }">
<spring:message code="policy_sipv6_user"/>
</c:if>
</td>
<td>
<c:forEach items="${users }" var="user">
<c:if test="${indexCfg.translatedUserId eq user.userName }">
<spring:message code="${user.userName }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>

3
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
View File

@@ -190,10 +190,11 @@ var switchUserType = function(obj){
varStatus="satus">
<label class="radio-inline"> <c:if
test="${_cfg.functionId eq service.functionId}">
<input type="radio" name="action"
<input type="radio" name="action" class="action"
serviceId="${service.serviceId }"
protocolId="${service.protocolId }"
regionCode="${service.regionCode }"
configDolog="${service.configDoLog }"
value="${service.action }" class="required action"
<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

8
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp
View File

@@ -124,9 +124,9 @@
<form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
<%-- <form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option> --%>
<form:option value="userName"><spring:message code="user"></spring:message></form:option>
<form:option value="userType"><spring:message code="user_type"></spring:message></form:option>
<%-- <form:option value="userType"><spring:message code="user_type"></spring:message></form:option> --%>
<form:option value="addrPoolName"><spring:message code="address_pool"></spring:message></form:option>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
</form:select>
@@ -329,7 +329,7 @@
<th column="address_pool"><spring:message code="address_pool"/></th>
<th column="user_type"><spring:message code="user_type"/></th>
<th column="user"><spring:message code="user"/></th>
<th column="ip"><spring:message code="ip"/></th>
<%-- <th column="ip"><spring:message code="ip"/></th> --%>
<th column="log_total"><spring:message code="log_total"/></th>
<%-- <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> --%>
<th column="valid_identifier" class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
@@ -381,7 +381,7 @@
</c:if>
</c:forEach>
</td>
<td>${indexCfg.srcIpAddress }</td>
<%-- <td>${indexCfg.srcIpAddress }</td> --%>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<%-- <td>