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

Advanced APP protocol字符串默认为子串匹配

Browse Source
This commit is contained in:
duandongmei
2018-08-09 17:57:13 +08:00
parent 9b1f4d30cc
commit 3984085502
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -96,6 +96,7 @@ $(function(){
</c:if> </c:if>
</c:forEach> </c:forEach>
<div class="form-body"> <div class="form-body">
<div class="row">
<!-- desc and action --> <!-- desc and action -->
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@@ -194,7 +195,7 @@ $(function(){
<select name="matchMethod" <select name="matchMethod"
class="selectpicker select2 form-control required"> class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC"> <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.itemValue}"/></option> <option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -220,6 +221,7 @@ $(function(){
</div> </div>
</div> </div>
</div> --%> </div> --%>
</div>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div> </div>

6
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -111,6 +111,7 @@ $(function(){
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
@@ -180,7 +181,7 @@ $(function(){
<select name="matchMethod" <select name="matchMethod"
class="selectpicker select2 form-control required"> class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC"> <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.itemValue}"/></option> <option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -198,7 +199,7 @@ $(function(){
<select name="isHexbin" <select name="isHexbin"
class="selectpicker select2 form-control required"> class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC"> <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.itemValue}"/></option> <option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -206,6 +207,7 @@ $(function(){
</div> </div>
</div> </div>
</div> </div>
</div>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div> </div>

8
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -111,6 +111,7 @@ $(function(){
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
@@ -205,7 +206,7 @@ $(function(){
<select name="matchMethod" <select name="matchMethod"
class="selectpicker select2 form-control required"> class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC"> <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.itemValue}"/></option> <option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
@@ -220,14 +221,15 @@ $(function(){
<select name="isHexbin" <select name="isHexbin"
class="selectpicker select2 form-control required"> class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC"> <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.itemValue}"/></option> <option value="${isHexbinC.itemCode}" <c:if test="${_cfg.isHexbin==isHexbinC.itemCode || (_cfg.isHexbin==null && isHexbinC.itemCode==0)}">selected</c:if>><spring:message code="${isHexbinC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<div for="isHexbin"></div> <div for="isHexbin"></div>
</div> </div>
</div> </div>
</div> </div>
</div>
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
<%@include file="/WEB-INF/include/form/basicInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
</div> </div>

4
src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
View File

@@ -199,7 +199,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="strFeaturesCfgList[${index1}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" > <select name="strFeaturesCfgList[${index1}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
<option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option> <option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 || empty _cfg.strFeaturesCfgList[index1].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option> <option value="1" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option> <option value="2" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option> <option value="3" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
@@ -289,7 +289,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="complexFeaturesList[${index2}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" > <select name="complexFeaturesList[${index2}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
<option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option> <option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 || empty _cfg.complexFeaturesList[index2].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option> <option value="1" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option> <option value="2" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option> <option value="3" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>

4
src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
View File

@@ -85,7 +85,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="strFeaturesCfgList[${index1}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" > <select name="strFeaturesCfgList[${index1}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
<option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option> <option value="0" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==0 || empty _cfg.strFeaturesCfgList[index1].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option> <option value="1" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option> <option value="2" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option> <option value="3" <c:if test="${_cfg.strFeaturesCfgList[index1].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
@@ -174,7 +174,7 @@ $(function(){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="match_method"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="complexFeaturesList[${index2}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" > <select name="complexFeaturesList[${index2}].matchMethod" class="required selectpicker select2 form-control" title="<spring:message code="select"/>" >
<option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option> <option value="0" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==0 || empty _cfg.complexFeaturesList[index2].matchMethod}">selected</c:if>><spring:message code="substring_match"></spring:message></option>
<option value="1" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option> <option value="1" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
<option value="2" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option> <option value="2" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
<option value="3" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option> <option value="3" <c:if test="${_cfg.complexFeaturesList[index2].matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>