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

(1)恢复IP sec被删除的协议部分

Browse Source 
(2)新增字典ICMP_PROTOCOL,加到PROTOCOL字典上的ICMP删除
This commit is contained in:
wangxin
2018-08-01 14:58:22 +08:00
parent f3c44ad16e
commit 35a7b360f1
4 changed files with 9 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/sql/update_ip_addr.sql
View File

@@ -1,2 +1,2 @@
INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES (5,'ipaddr','ip地址',0,1,1,66)
INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES (1,'ICMP','ICMP',0,1,1,63)
#字典新增 模块名称ICMP协议，字典标识ICMP_PROTOCOL，字典值：标识：1，值ICMP

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

@@ -29,17 +29,9 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
<div class="col-md-6">
<select name="protocol" class="selectpicker show-tick form-control required">
<c:choose>
<c:when test="${specialProtocol!=null and specialProtocol eq 'ipsec'}">
</c:when>
<c:otherwise>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</c:otherwise>
</c:choose>
<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
</c:forEach>
</select>
<input type="hidden" name="protocolId" value="0">
</div>

5
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -357,6 +357,11 @@
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
</c:forEach>
</c:if>
<c:if test="${specialFunctionId eq 'ipaddr'}">
<c:forEach items="${fns:getDictList('ICMP_PROTOCOL')}" var="icmp">
<c:if test="${cfg.protocol eq icmp.itemCode}"><spring:message code="${icmp.itemValue }"/></c:if>
</c:forEach>
</c:if>
<c:if test="${specialFunctionId eq 'ipsec'}">
<c:forEach items="${fns:getDictList('IPSEC_PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>

84
src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
View File

@@ -162,92 +162,8 @@ $(function(){
<c:set var="specialProtocol" value="${sfi.itemValue}"/>
</c:if>
</c:forEach>
<c:if test="${specialProtocol ne 'ipmulitiplex'}">
<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
</c:if>
<c:if test="${specialProtocol ne null and specialProtocol eq 'ipmulitiplex'}">
<%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
<div class="col-md-6">
<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control required">
<option value="" <c:if test="${empty _cfg.dnsStrategyId }">selected</c:if>><spring:message code="select"/></option>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>
</select>
</div>
<div for="dnsStrategyId"></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="ir_type"/></label>
<div class="col-md-6">
<select name="irType" class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getDictList('IR_TYPE')}" var="irTypeC">
<option value="${irTypeC.itemCode}" <c:if test="${_cfg.irType==irTypeC.itemCode}">selected</c:if>><spring:message code="${irTypeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="irType"></div>
</div>
</div>
</div>
</c:if>
<c:if test="${specialProtocol ne null and specialProtocol eq 'ipratelimit'}">
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6">
<input class="form-control required number" range="[0,100]" type="text" name="ratelimit">
</div>
<div for="ratelimit"></div>
</div>
</div>
</div>
</c:if>
<c:if test="${specialProtocol!=null and specialProtocol eq 'pxyIpControl'}">
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="REDIRECT_RESPONSE_CODE" /></label>
<div class="col-md-6">
<select name="userRegion1"
class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('REDIRECT_RESPONSE_CODE')}" var="responseCode">
<option value="${responseCode.itemValue}" <c:if test="${_cfg.userRegion1==responseCode.itemValue}">selected</c:if>><spring:message code="${responseCode.itemCode}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion1"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message
code="redirect_content" /></label>
<div class="col-md-6">
<input class="form-control" type="text" name="userRegion2"
value="${_cfg.userRegion2}">
</div>
<div for="userRegion2"></div>
</div>
</div>
</div>
</c:if>
<c:if test="${specialProtocol ne 'ipmulitiplex'}">
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
</c:if>
<c:if test="${specialProtocol eq 'ipmulitiplex'}">
<input type="hidden" name="isAreaEffective" value="0" >
</c:if>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div>
<div class="form-actions">