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

修改contIp、picIp、contUrl、picUrl列表显示格式与值

Browse Source 
增加ipPattern、portPattern、direction、protocol、ishexbin、matchMethod字典，其中itemDesc属性修改为国际化code属性
This commit is contained in:
duandongmei
2018-06-05 11:34:48 +08:00
parent 03a686f002
commit ca60449f5e
12 changed files with 130 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
View File

@@ -221,7 +221,7 @@ public class AvContentController extends BaseController {
initFormCondition(model,cfg);
}
model.addAttribute("_cfg", cfg);
return "/cfg/av/contIp/contIpForm";
return "/cfg/av/picIp/picIpForm";
}
//保存CONTIP信息

2
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -1114,7 +1114,7 @@
protocol_id = #{protocolId,jdbcType=INTEGER},
</if>
<if test="direction != null" >
protocol_id = #{direction,jdbcType=INTEGER},
direction = #{direction,jdbcType=INTEGER},
</if>
<if test="destPort != null and destPort != ''" >
dest_port = #{destPort,jdbcType=VARCHAR},

2
src/main/java/com/nis/web/service/configuration/AvContentCfgService.java
View File

@@ -1191,7 +1191,7 @@ public class AvContentCfgService extends BaseService{
if(!StringUtil.isEmpty(list)){
//TODO DELETE后期删除
for (BaseStringCfg strCfg : list) {
strCfg.setCfgType("MM_AV_UR");
strCfg.setCfgType("MM_AV_URL");
}
Map<String,List> strMap = cfgConvert(strRegionList,list,2,entity,groupRelationList);
groupRelationList=strMap.get("groupList");

29
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -145,8 +145,8 @@ $(function(){
<select id="_areaCfg.ipType" class="show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${ipTypeC.itemCode==_areaCfg.ipType || (_areaCfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>>${ipTypeC.itemValue}</option>
</c:forEach>
<option value="${ipTypeC.itemCode}" <c:if test="${_areaCfg.ipType==ipTypeC.itemCode || (_areaCfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="_areaCfg.ipType"></div>
@@ -159,9 +159,9 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select id="_areaCfg.ipPattern" class="show-tick form-control required">
<option value="1" <c:if test="${_areaCfg.ipPattern==1 }">selected</c:if>><spring:message code="ip_subnet"/></option>
<option value="2" <c:if test="${_areaCfg.ipPattern==1 }">selected</c:if>><spring:message code="ip_range"/></option>
<option value="3" <c:if test="${_areaCfg.ipPattern==3 || _areaCfg.ipPattern==null}">selected</c:if>><spring:message code="ip"/></option>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${_areaCfg.ipPattern==ipPatternC.itemCode || (_areaCfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="_areaCfg.ipPattern"></div>
@@ -184,8 +184,9 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select id="_areaCfg.portPattern" class="show-tick form-control required">
<option value="1" <c:if test="${_areaCfg.portPattern==1 || _areaCfg.portPattern==null}">selected</c:if>><spring:message code="port"/></option>
<option value="2" <c:if test="${_areaCfg.portPattern==1}">selected</c:if>><spring:message code="port_mask"/></option>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${_areaCfg.portPattern==portPatternC.itemCode || (_areaCfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="_areaCfg.portPattern"></div>
@@ -227,10 +228,9 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
<div class="col-md-6">
<select id="_areaCfg.protocol" class="show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<option value="6" <c:if test="${_areaCfg.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${_areaCfg.protocol==17}">selected</c:if> >UDP</option>
<option value="0" <c:if test="${_areaCfg.protocol==0 || _areaCfg.protocol==null}">selected</c:if> ><spring:message code="arbitrary"/></option>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}" <c:if test="${_areaCfg.protocol==protocolC.itemCode || (_areaCfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
</c:forEach>
</select>
<input type="hidden" id="_areaCfg.protocolId" value="${_areaCfg.protocolId}">
</div>
@@ -242,10 +242,9 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
<div class="col-md-6">
<select id="_areaCfg.direction" class="show-tick form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${_areaCfg.direction==0 || _areaCfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_areaCfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
<option value="2" <c:if test="${_areaCfg.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<option value="${directionC.itemCode}" <c:if test="${_areaCfg.direction==directionC.itemCode || (_areaCfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="_areaCfg.direction"></div>

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

@@ -9,8 +9,8 @@
<div class="col-md-6">
<select name="ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>>${ipTypeC.itemValue}</option>
</c:forEach>
<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="ipType"></div>
@@ -23,9 +23,9 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select name="ipPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${_cfg.ipPattern==1}">selected</c:if> ><spring:message code="ip_subnet"/></option>
<option value="2" <c:if test="${_cfg.ipPattern==2}">selected</c:if>><spring:message code="ip_range"/></option>
<option value="3" <c:if test="${_cfg.ipPattern==3 || _cfg.ipPattern==null}">selected</c:if>>IP</option>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="ipPattern"></div>
@@ -54,8 +54,9 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select name="portPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${_cfg.portPattern==1 || _cfg.portPattern== null}">selected</c:if> >port</option>
<option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="portPattern"></div>
@@ -111,10 +112,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">
<option value=""><spring:message code="select"/></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 || _cfg.protocol==null}">selected</c:if>><spring:message code="arbitrary"/></option>
<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.itemDesc}"/></option>
</c:forEach>
</select>
<input type="hidden" name="protocolId" value="0">
</div>
@@ -126,10 +126,9 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
<div class="col-md-6">
<select name="direction" class="selectpicker show-tick form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.direction==0 || _cfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_cfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
<option value="2" <c:if test="${_cfg.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="direction"></div>

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

@@ -17,10 +17,9 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
<div class="col-md-6">
<select name="isHexbin" class="selectpicker select2 form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.isHexbin==0 || _cfg.isHexbin==null }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="isHexbin"></div>
@@ -51,11 +50,9 @@
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6">
<select name="matchMethod" class="selectpicker select2 form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.matchMethod==3 || _cfg.matchMethod==null}">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="matchMethod"></div>

30
src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
View File

@@ -305,15 +305,35 @@
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.ipType }</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>${cfg.srcIpAddress }</td>
<td>${cfg.srcPort }</td>
<td>${cfg.destIpAddress }</td>
<td>${cfg.destPort }</td>
<td>${cfg.ipPattern }</td>
<td>${cfg.portPattern }</td>
<td>${cfg.direction }</td>
<td>${cfg.protocol }</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemValue eq cfg.action }">

13
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -299,19 +299,18 @@
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:if test="${cfg.isHexbin==0}"><spring:message code="case_insensitive_nohex"></spring:message></c:if>
<c:if test="${voipAccount.isHexbin==1 }"><spring:message code="hex_binary"></spring:message></c:if>
<c:if test="${voipAccount.isHexbin==2 }"><spring:message code="case_sensitive_nohex"></spring:message></c:if>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
</td>
<td>
<c:if test="${cfg.matchMethod==0 }"><spring:message code="substring_match"></spring:message></c:if>
<c:if test="${cfg.matchMethod==1 }"><spring:message code="right_match"></spring:message></c:if>
<c:if test="${cfg.matchMethod==2 }"><spring:message code="left_match"></spring:message></c:if>
<c:if test="${cfg.matchMethod==3 }"><spring:message code="exactly_match"></spring:message></c:if>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

30
src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
View File

@@ -305,15 +305,35 @@
<tr>
<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
<td>${cfg.cfgDesc }</td>
<td>${cfg.ipType }</td>
<td>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>${cfg.srcIpAddress }</td>
<td>${cfg.srcPort }</td>
<td>${cfg.destIpAddress }</td>
<td>${cfg.destPort }</td>
<td>${cfg.ipPattern }</td>
<td>${cfg.portPattern }</td>
<td>${cfg.direction }</td>
<td>${cfg.protocol }</td>
<td>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemValue eq cfg.action }">

13
src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
View File

@@ -299,19 +299,18 @@
<td>${cfg.cfgDesc }</td>
<td>${cfg.cfgKeywords }</td>
<td>
<c:if test="${cfg.isHexbin==0}"><spring:message code="case_insensitive_nohex"></spring:message></c:if>
<c:if test="${voipAccount.isHexbin==1 }"><spring:message code="hex_binary"></spring:message></c:if>
<c:if test="${voipAccount.isHexbin==2 }"><spring:message code="case_sensitive_nohex"></spring:message></c:if>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemDesc}"/></c:if>
</c:forEach>
</td>
<td>
<c:if test="${cfg.exprType==1}"><spring:message code="and"/></c:if>
<c:if test="${cfg.exprType==0}"><spring:message code="null"/></c:if>
</td>
<td>
<c:if test="${cfg.matchMethod==0 }"><spring:message code="substring_match"></spring:message></c:if>
<c:if test="${cfg.matchMethod==1 }"><spring:message code="right_match"></spring:message></c:if>
<c:if test="${cfg.matchMethod==2 }"><spring:message code="left_match"></spring:message></c:if>
<c:if test="${cfg.matchMethod==3 }"><spring:message code="exactly_match"></spring:message></c:if>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemDesc}"/></c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

42
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -185,10 +185,9 @@ var delContent=function(contentClassName,addBtnClassName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="whether_hexbinary"/></label>
<div class="col-md-6">
<select name="voipAccounts[${status.index }].isHexbin" class="selectpicker select2 form-control required">
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${voipAccount.isHexbin==0 || voipAccount.isHexbin==null}">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
<option value="1" <c:if test="${voipAccount.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
<option value="2" <c:if test="${voipAccount.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<option value="${isHexbinC.itemCode}" <c:if test="${voipAccount.isHexbin==isHexbinC.itemCode || (voipAccount.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="voipAccounts[${status.index }].isHexbin"></div>
@@ -219,11 +218,9 @@ var delContent=function(contentClassName,addBtnClassName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6">
<select name="voipAccounts[${status.index }].matchMethod" class="selectpicker select2 form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${voipAccount.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${voipAccount.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${voipAccount.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${voipAccount.matchMethod==3 || voipAccount.matchMethod==null}">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="voipAccounts[${status.index }].matchMethod"></div>
@@ -274,7 +271,7 @@ var delContent=function(contentClassName,addBtnClassName){
<div class="col-md-6">
<select name="voipIps[${status.index }].ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType" varStatus="satus">
<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode || (voipIp.ipType==null && ipType.itemCode==4)}">selected</c:if> >${ipType.itemValue}</option>
<option value="${ipType.itemCode}" <c:if test="${voipIp.ipType==ipType.itemCode || (voipIp.ipType==null && ipType.itemCode==4)}">selected</c:if> ><spring:message code="${ipType.itemDesc}"/></option>
</c:forEach>
</select>
</div>
@@ -288,9 +285,9 @@ var delContent=function(contentClassName,addBtnClassName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select name="voipIps[${status.index }].ipPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${voipIp.ipPattern==1}">selected</c:if> ><spring:message code="ip_subnet"/></option>
<option value="2" <c:if test="${voipIp.ipPattern==2}">selected</c:if>><spring:message code="ip_range"/></option>
<option value="3" <c:if test="${voipIp.ipPattern==3 || voipIp.ipPattern==null}">selected</c:if>>IP</option>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC" varStatus="satus">
<option value="${ipPatternC.itemCode}" <c:if test="${voipIp.ipPattern==ipPatternC.itemCode || (voipIp.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if> ><spring:message code="${ipPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="voipIps[${status.index }].ipPattern"></div>
@@ -319,8 +316,9 @@ var delContent=function(contentClassName,addBtnClassName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select name="voipIps[${status.index }].portPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${voipIp.portPattern==1 || voipIp.portPattern== null}">selected</c:if> >port</option>
<option value="2" <c:if test="${voipIp.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC" varStatus="satus">
<option value="${portPatternC.itemCode}" <c:if test="${voipIp.portPattern==portPatternC.itemCode || (voipIp.portPattern==null && portPatternC.itemCode==1)}">selected</c:if> ><spring:message code="${portPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="voipIps[${status.index }].portPattern"></div>
@@ -376,10 +374,9 @@ var delContent=function(contentClassName,addBtnClassName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
<div class="col-md-6">
<select name="voipIps[${status.index }].protocol" class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select"/></option>
<option value="6" <c:if test="${voipIp.protocol==6}">selected</c:if>>TCP</option>
<option value="17" <c:if test="${voipIp.protocol==17}">selected</c:if>>UDP</option>
<option value="0" <c:if test="${voipIp.protocol==0 || voipIp.protocol==null}">selected</c:if>><spring:message code="arbitrary"/></option>
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC" varStatus="satus">
<option value="${protocolC.itemCode}" <c:if test="${voipIp.protocol==protocolC.itemCode || (voipIp.protocol==null && protocolC.itemCode==0)}">selected</c:if> ><spring:message code="${protocolC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="voipIps[${status.index }].protocol"></div>
@@ -390,10 +387,9 @@ var delContent=function(contentClassName,addBtnClassName){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
<div class="col-md-6">
<select name="voipIps[${status.index }].direction" class="selectpicker show-tick form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${voipIp.direction==0 || voipIp.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${voipIp.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
<option value="2" <c:if test="${voipIp.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC" varStatus="satus">
<option value="${directionC.itemCode}" <c:if test="${voipIp.direction==directionC.itemCode || (voipIp.direction==null && directionC.itemCode==0)}">selected</c:if> ><spring:message code="${directionC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="voipIps[${status.index }].direction"></div>

16
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -194,10 +194,19 @@
html+="<label><spring:message code='ip_type'/>：</label>";
html+="<label>"
if(item.ipType==4){
html+="V4";
html+="<spring:message code='IPV4'/>";
}
if(item.ipType==6){
html+="V6";
html+="<spring:message code='IPV6'/>";
}
if(item.ipType==46){
html+="<spring:message code='4over6'/>";
}
if(item.ipType==64){
html+="<spring:message code='6over4'/>";
}
if(item.ipType==10){
html+="<spring:message code='all'/>";
}
html+="</label>";
html+="</div>";
@@ -293,10 +302,9 @@
if(item.protocol==17){
html+="UDP"
}
if(item.protocol==2){
if(item.protocol==0){
html+="<spring:message code='arbitrary'/>"
}
html+=item.protocol;
html+="</label>";
html+="</div>";
html+="</div>";