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

1、修改HTTP/DNS/SSL/MAIL/FTP配置、列表界面字典参数项，以及增加区域管控的查看连接；

Browse Source 
2、音视频样例状态修改提交服务接口参数修改，以及界面必填项标识增加；

3、所有数据角色非admin用户过滤配置审核取消的配置；

4、修改功能配置域字典排序。

Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-06-05 18:25:40 +08:00
parent 02177e655c
commit f18dc424ac
21 changed files with 192 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@
<if test="configRegionCode != null">
AND config_region_code=#{configRegionCode,jdbcType=VARCHAR}
</if>
order by region_type desc
order by dict_id
</select>
</mapper>

3
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -148,8 +148,9 @@ public abstract class BaseService {
}
}else{
// 如果包含全部权限，则去掉之前添加的所有条件，并跳出循环。
// 如果包含全部权限，则去掉之前添加的所有条件但增加配置审核取消以及删除的配置，并跳出循环。
sqlString = new StringBuilder();
sqlString.append(" OR " + configAlias + ".is_audit !=3");
}
}
if (StringUtils.isNotBlank(sqlString.toString())){

8
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -165,10 +165,8 @@ public class AvCfgService extends BaseService{
cfg.setCompileId(entity.getCompileId());
cfg.setServiceId(entity.getServiceId());
list.add(cfg);
Map map = new HashMap();
map.put("updateStatCfgList", list);
//调用服务接口取消配置
String json=gsonToJson(map);
String json=gsonToJson(list);
logger.info("音视频文件样例下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.put(json,2);
@@ -205,10 +203,8 @@ public class AvCfgService extends BaseService{
cfg.setCompileId(entity.getCompileId());
cfg.setServiceId(entity.getServiceId());
list.add(cfg);
Map map = new HashMap();
map.put("updateStatCfgList", list);
//调用服务接口取消配置
String json=gsonToJson(map);
String json=gsonToJson(list);
logger.info("标志样例下发配置参数："+json);
//调用服务接口取消配置
ToMaatResult result = ConfigServiceUtil.put(json, 2);

2
src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
View File

@@ -188,7 +188,7 @@ $(function(){
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service">
<label class="radio-inline">

5
src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
View File

@@ -275,7 +275,6 @@
<th><spring:message code="harm_level"/></th>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
@@ -316,10 +315,6 @@
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td>
<td>${cfg.requestName }</td>
<td>
<c:set var="classify"></c:set>

2
src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
View File

@@ -124,7 +124,7 @@ $(function(){
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="action"/></label>
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="action"/></label>
<div class="col-md-6">
<c:forEach items="${serviceList}" var="service">
<label class="radio-inline">

5
src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
View File

@@ -278,7 +278,6 @@
<th><spring:message code="harm_level"/></th>
<th><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="attribute"/></th>
@@ -313,10 +312,6 @@
</c:if>
</c:forEach>
</td>
<td>
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${cfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
</td>
<td>${cfg.requestName }</td>
<td>
<c:set var="classify"></c:set>

29
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -88,19 +88,9 @@
<div class="col-md-6">
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${complexCfg.matchMethod==0 || complexCfg.matchMethod==null }">selected</c:if>><spring:message
code="substring_match"></spring:message></option>
<option value="1"
<c:if test="${complexCfg.matchMethod==1 }">selected</c:if>><spring:message
code="right_match"></spring:message></option>
<option value="2"
<c:if test="${complexCfg.matchMethod==2 }">selected</c:if>><spring:message
code="left_match"></spring:message></option>
<option value="3"
<c:if test="${complexCfg.matchMethod==3 || complexCfg.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="${complexCfg.matchMethod==matchMethodC.itemCode || (complexCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.matchMethod"></div>
@@ -115,16 +105,9 @@
<div class="col-md-6">
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${complexCfg.isHexbin==0 || complexCfg.isHexbin==null}">selected</c:if>><spring:message
code="case_insensitive_nohex"></spring:message></option>
<option value="1"
<c:if test="${complexCfg.isHexbin==1 }">selected</c:if>><spring:message
code="hex_binary"></spring:message></option>
<option value="2"
<c:if test="${complexCfg.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="${complexCfg.isHexbin==isHexbinC.itemCode || (complexCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.isHexbin"></div>

2
src/main/webapp/WEB-INF/views/cfg/digestCfgForm.jsp
View File

@@ -48,7 +48,7 @@
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="cfds_level" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
<input class="form-control required digits" type="text"
name="${cfgName}.cfdsLevel"
value="${digestCfg.cfdsLevel}">
</div>

6
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
View File

@@ -339,7 +339,11 @@
</td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
<c:if test="${cfg.isAreaEffective==1}">
<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
<spring:message code="yes"/>
</a>
</c:if>
</td>
<td>${indexCfg.requestName }</td>
<td>

54
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpSubList.jsp
View File

@@ -30,10 +30,8 @@
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${cfg.ipType==ipType.itemCode}">
${ipType.itemValue}
</c:if>
<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>
</label>
</div>
@@ -42,11 +40,9 @@
<div class="form-group">
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.ipPattern eq 1}"><spring:message code='ip_subnet'/></c:when>
<c:when test="${cfg.ipPattern eq 2}"><spring:message code='ip_range'/></c:when>
<c:otherwise>IP</c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -64,10 +60,9 @@
<div class="form-group">
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.portPattern eq 1}">port</c:when>
<c:when test="${cfg.portPattern eq 2}"><spring:message code='port_mask'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -92,11 +87,9 @@
<div class="form-group">
<label><spring:message code='direction'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.direction eq 0}"><spring:message code='twoway'/></c:when>
<c:when test="${cfg.direction eq 1}"><spring:message code='ingress'/></c:when>
<c:otherwise><spring:message code='degress'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -104,11 +97,9 @@
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.protocol eq 6}">TCP</c:when>
<c:when test="${cfg.protocol eq 17}">UDP</c:when>
<c:otherwise><spring:message code='arbitrary'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -145,12 +136,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -158,11 +146,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>

51
src/main/webapp/WEB-INF/views/cfg/ipCfgForm.jsp
View File

@@ -11,7 +11,7 @@ $(function(){
</head>
<c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${_cfg.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}">
test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}">
<!-- regionDistrict.regionType==1表示IP类配置 -->
<input type="hidden" name="${cfgName}.cfgType" value="${regionDistrict.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${regionDistrict.configRegionCode }">
@@ -32,10 +32,8 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.ipType"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}" <c:if test="${ipPort.ipType==ipType.itemCode}">selected</c:if> >
${ipType.itemValue}
</option>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
<option value="${ipTypeC.itemCode}" <c:if test="${ipPort.ipType==ipTypeC.itemCode || (ipPort.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
@@ -51,14 +49,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.ipPattern"
class="selectpicker show-tick form-control required">
<option value="1"
<c:if test="${ipPort.ipPattern==1 || ipPort.ipPattern==null}">selected</c:if>><spring:message
code="subnet" /></option>
<option value="2"
<c:if test="${ipPort.ipPattern==2}">selected</c:if>><spring:message
code="ip_range" /></option>
<option value="3"
<c:if test="${ipPort.ipPattern==3}">selected</c:if>>IP</option>
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}" <c:if test="${ipPort.ipPattern==ipPatternC.itemCode || (ipPort.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.ipPattern"></div>
@@ -85,11 +78,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.portPattern"
class="selectpicker show-tick form-control required">
<option value="1"
<c:if test="${ipPort.portPattern==1 || ipPort.portPattern== null}">selected</c:if>>port</option>
<option value="2"
<c:if test="${ipPort.portPattern==2}">selected</c:if>><spring:message
code="subnet" /></option>
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}" <c:if test="${ipPort.portPattern==portPatternC.itemCode || (ipPort.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.portPattern"></div>
@@ -142,14 +133,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.protocol"
class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select" /></option>
<option value="6"
<c:if test="${ipPort.protocol==6}">selected</c:if>>TCP</option>
<option value="17"
<c:if test="${ipPort.protocol==17}">selected</c:if>>UDP</option>
<option value="0"
<c:if test="${ipPort.protocol==0 || ipPort.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="${ipPort.protocol==protocolC.itemCode || (ipPort.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.protocol"></div>
@@ -162,16 +148,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.direction"
class="selectpicker show-tick form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${ipPort.direction==0 || ipPort.direction==null}">selected</c:if>><spring:message
code="twoway" /></option>
<option value="1"
<c:if test="${ipPort.direction==1 }">selected</c:if>>
<spring:message code="ingress" /></option>
<option value="2"
<c:if test="${ipPort.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="${ipPort.direction==directionC.itemCode || (ipPort.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.direction"></div>

6
src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
View File

@@ -339,7 +339,11 @@
</td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">
<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
<spring:message code="yes"/>
</a>
</c:if>
</td>
<td>${indexCfg.requestName }</td>
<td>

55
src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
View File

@@ -2,6 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
<script>
$(document).ready(function() {
//$("div[name='tabTitle"+index+"']").get(0).click();
@@ -30,10 +31,8 @@
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${cfg.ipType==ipType.itemCode}">
${ipType.itemValue}
</c:if>
<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>
</label>
</div>
@@ -42,11 +41,9 @@
<div class="form-group">
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.ipPattern eq 1}"><spring:message code='ip_subnet'/></c:when>
<c:when test="${cfg.ipPattern eq 2}"><spring:message code='ip_range'/></c:when>
<c:otherwise>IP</c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -64,10 +61,9 @@
<div class="form-group">
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.portPattern eq 1}">port</c:when>
<c:when test="${cfg.portPattern eq 2}"><spring:message code='port_mask'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -92,11 +88,9 @@
<div class="form-group">
<label><spring:message code='direction'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.direction eq 0}"><spring:message code='twoway'/></c:when>
<c:when test="${cfg.direction eq 1}"><spring:message code='ingress'/></c:when>
<c:otherwise><spring:message code='degress'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -104,11 +98,9 @@
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.protocol eq 6}">TCP</c:when>
<c:when test="${cfg.protocol eq 17}">UDP</c:when>
<c:otherwise><spring:message code='arbitrary'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -150,12 +142,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -163,11 +152,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>

31
src/main/webapp/WEB-INF/views/cfg/stringCfgForm.jsp
View File

@@ -11,7 +11,7 @@ $(function(){
</head>
<c:forEach items="${regionList}" var="regionDistrict">
<c:if
test="${_cfg.functionId eq regionDistrict.functionId
test="${strCfg.functionId eq regionDistrict.functionId
and regionDistrict.regionType eq 2
and regionValue eq regionDistrict.configRegionValue}">
<!-- regionDistrict.regionType==2表示字符串类配置 -->
@@ -67,19 +67,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.matchMethod"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${strCfg.matchMethod==0 || strCfg.matchMethod==null }">selected</c:if>><spring:message
code="substring_match"></spring:message></option>
<option value="1"
<c:if test="${strCfg.matchMethod==1 }">selected</c:if>><spring:message
code="right_match"></spring:message></option>
<option value="2"
<c:if test="${strCfg.matchMethod==2 }">selected</c:if>><spring:message
code="left_match"></spring:message></option>
<option value="3"
<c:if test="${strCfg.matchMethod==3 || strCfg.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="${strCfg.matchMethod==matchMethodC.itemCode || (strCfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.matchMethod"></div>
@@ -94,16 +84,9 @@ $(function(){
<div class="col-md-6">
<select name="${cfgName}.isHexbin"
class="selectpicker select2 form-control required">
<option value=""><spring:message code="select" /></option>
<option value="0"
<c:if test="${strCfg.isHexbin==0 || strCfg.isHexbin==null}">selected</c:if>><spring:message
code="case_insensitive_nohex"></spring:message></option>
<option value="1"
<c:if test="${strCfg.isHexbin==1 }">selected</c:if>><spring:message
code="hex_binary"></spring:message></option>
<option value="2"
<c:if test="${strCfg.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="${strCfg.isHexbin==isHexbinC.itemCode || (strCfg.matchMethod==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemDesc}"/></option>
</c:forEach>
</select>
</div>
<div for="${cfgName}.isHexbin"></div>

6
src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
View File

@@ -338,7 +338,11 @@
</td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">
<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
<spring:message code="yes"/>
</a>
</c:if>
</td>
<td>${indexCfg.requestName }</td>
<td>

54
src/main/webapp/WEB-INF/views/cfg/website/dnsSubList.jsp
View File

@@ -30,10 +30,8 @@
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${cfg.ipType==ipType.itemCode}">
${ipType.itemValue}
</c:if>
<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>
</label>
</div>
@@ -42,11 +40,9 @@
<div class="form-group">
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.ipPattern eq 1}"><spring:message code='ip_subnet'/></c:when>
<c:when test="${cfg.ipPattern eq 2}"><spring:message code='ip_range'/></c:when>
<c:otherwise>IP</c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -64,10 +60,9 @@
<div class="form-group">
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.portPattern eq 1}">port</c:when>
<c:when test="${cfg.portPattern eq 2}"><spring:message code='port_mask'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -92,11 +87,9 @@
<div class="form-group">
<label><spring:message code='direction'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.direction eq 0}"><spring:message code='twoway'/></c:when>
<c:when test="${cfg.direction eq 1}"><spring:message code='ingress'/></c:when>
<c:otherwise><spring:message code='degress'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -104,11 +97,9 @@
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.protocol eq 6}">TCP</c:when>
<c:when test="${cfg.protocol eq 17}">UDP</c:when>
<c:otherwise><spring:message code='arbitrary'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -150,12 +141,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -163,11 +151,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>

6
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -339,7 +339,11 @@
</td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">
<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
<spring:message code="yes"/>
</a>
</c:if>
</td>
<td>${indexCfg.requestName }</td>
<td>

122
src/main/webapp/WEB-INF/views/cfg/website/httpSubList.jsp
View File

@@ -62,10 +62,8 @@
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${cfg.ipType==ipType.itemCode}">
${ipType.itemValue}
</c:if>
<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>
</label>
</div>
@@ -74,11 +72,9 @@
<div class="form-group">
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.ipPattern eq 1}"><spring:message code='ip_subnet'/></c:when>
<c:when test="${cfg.ipPattern eq 2}"><spring:message code='ip_range'/></c:when>
<c:otherwise>IP</c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -96,10 +92,9 @@
<div class="form-group">
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.portPattern eq 1}">port</c:when>
<c:when test="${cfg.portPattern eq 2}"><spring:message code='port_mask'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -124,11 +119,9 @@
<div class="form-group">
<label><spring:message code='direction'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.direction eq 0}"><spring:message code='twoway'/></c:when>
<c:when test="${cfg.direction eq 1}"><spring:message code='ingress'/></c:when>
<c:otherwise><spring:message code='degress'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -136,11 +129,9 @@
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.protocol eq 6}">TCP</c:when>
<c:when test="${cfg.protocol eq 17}">UDP</c:when>
<c:otherwise><spring:message code='arbitrary'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -170,12 +161,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -185,11 +173,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -232,12 +218,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -245,11 +228,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -284,12 +265,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -299,11 +277,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -346,12 +322,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -359,11 +332,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -400,12 +371,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -415,11 +383,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>

6
src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
View File

@@ -338,7 +338,11 @@
</td>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}"><spring:message code="yes"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">
<a areaEffectiveIds="${indexCfg.areaEffectiveIds }" compileId="${indexCfg.compileId }" href="javascript:void(0)" name="viewAreaInfo">
<spring:message code="yes"/>
</a>
</c:if>
</td>
<td>${indexCfg.requestName }</td>
<td>

54
src/main/webapp/WEB-INF/views/cfg/website/sslSubList.jsp
View File

@@ -30,10 +30,8 @@
<div class="form-group">
<label><spring:message code='ip_type'/>:</label>
<label>
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<c:if test="${cfg.ipType==ipType.itemCode}">
${ipType.itemValue}
</c:if>
<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>
</label>
</div>
@@ -42,11 +40,9 @@
<div class="form-group">
<label><spring:message code='ip_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.ipPattern eq 1}"><spring:message code='ip_subnet'/></c:when>
<c:when test="${cfg.ipPattern eq 2}"><spring:message code='ip_range'/></c:when>
<c:otherwise>IP</c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -64,10 +60,9 @@
<div class="form-group">
<label><spring:message code='port_pattern'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.portPattern eq 1}">port</c:when>
<c:when test="${cfg.portPattern eq 2}"><spring:message code='port_mask'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -92,11 +87,9 @@
<div class="form-group">
<label><spring:message code='direction'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.direction eq 0}"><spring:message code='twoway'/></c:when>
<c:when test="${cfg.direction eq 1}"><spring:message code='ingress'/></c:when>
<c:otherwise><spring:message code='degress'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -104,11 +97,9 @@
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>
<c:choose>
<c:when test="${cfg.protocol eq 6}">TCP</c:when>
<c:when test="${cfg.protocol eq 17}">UDP</c:when>
<c:otherwise><spring:message code='arbitrary'/></c:otherwise>
</c:choose>
<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>
</label>
</div>
</div>
@@ -142,12 +133,9 @@
<div class="form-group">
<label><spring:message code='match_method' />:</label>
<label>
<c:choose>
<c:when test="${cfg.matchMethod eq 0}"><spring:message code='substring_match'/></c:when>
<c:when test="${cfg.matchMethod eq 1}"><spring:message code='right_match'/></c:when>
<c:when test="${cfg.matchMethod eq 2}"><spring:message code='left_match'/></c:when>
<c:when test="${cfg.matchMethod eq 3}"><spring:message code='exactly_match'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>
@@ -157,11 +145,9 @@
<div class="form-group">
<label><spring:message code='whether_hexbinary' />:</label>
<label>
<c:choose>
<c:when test="${cfg.isHexbin eq 1}"><spring:message code='hex_binary'/></c:when>
<c:when test="${cfg.isHexbin eq 2}"><spring:message code='case_sensitive_nohex'/></c:when>
<c:when test="${cfg.isHexbin eq 0}"><spring:message code='case_insensitive_nohex'/></c:when>
</c:choose>
<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>
</label>
</div>
</div>