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

所有字符串域新增时，方便用户理解HEX和Case-senstive

Browse Source 
将“是否hex二进制”属性隐藏，增加是否二进制和是否大小写敏感两个选项，common.js中根据界面两个选项，自动设置隐藏的“是否二进制“属性的值【注：十六进制时，大小写敏感】

其他后期新增的界面，也需要这样处理
This commit is contained in:
duandongmei
2018-08-16 15:13:18 +08:00
parent c00f2a0999
commit 9450df24b5
9 changed files with 360 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/messages/message_en.properties
View File

@@ -1044,3 +1044,9 @@ tunnel_code=Tunnel Behavior No
tunnel_name=Tunnel Behavior Name
tunnel_desc=Tunnel Behavior Description
call_external_procedures_failed=Call external procedures failed
is_hex=Is HEX
is_case_insenstive=Is Case-senstive
case_senstive=Case-senstive
case_insenstive=Case-insenstive
hex=Hex
not_hex=Not HEX

6
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1044,3 +1044,9 @@ tunnel_code=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u5E8F\u53F7
tunnel_name=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u540D\u79F0
tunnel_desc=\u52A0\u5BC6\u96A7\u9053\u884C\u4E3A\u63CF\u8FF0
call_external_procedures_failed=\u8C03\u7528\u5916\u90E8\u7A0B\u5E8F\u51FA\u9519
is_hex=\u662F\u5426\u5341\u516D\u8FDB\u5236
is_case_insenstive=\u662F\u5426\u5927\u5C0F\u5199\u654F\u611F
case_senstive=\u5927\u5C0F\u5199\u654F\u611F
case_insenstive=\u5927\u5C0F\u5199\u4E0D\u654F\u611F
hex=\u5341\u516D\u8FDB\u5236
not_hex=\u975E\u5341\u516D\u8FDB\u5236

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

@@ -14,21 +14,6 @@
<div for="cfgKeywords" class="col-md-6"></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="whether_hexbinary"/></label>
<div class="col-md-6">
<select name="isHexbin" class="selectpicker select2 form-control required" >
<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>
</c:forEach>
</select>
</div>
<div for="isHexbin"></div>
</div>
</div>
</div>
<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="expression_type"/></label>
@@ -47,6 +32,8 @@
<div for="exprType"></div>
</div>
</div>
</div>
<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="match_method"/></label>
@@ -60,6 +47,60 @@
<div for="matchMethod"></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="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isHex" value="1" class="required"
<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="isHex" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
<div for="isHex"></div>
</div>
</div>
</div>
<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="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="1" class="required"
<c:if test="${_cfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<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" >
<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>
</c:forEach>
</select>
</div>
<div for="isHexbin"></div>
</div>
</div>
</div>
</div>

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

@@ -152,24 +152,6 @@ $(function(){
<div for="domain"></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="whether_hexbinary" /></label>
<div class="col-md-6">
<select name="isHexbin"
class="selectpicker select2 form-control required">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<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>
</select>
</div>
<div for="isHexbin"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
@@ -190,6 +172,50 @@ $(function(){
<div for="exprType"></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="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isHex" value="1" class="required"
<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="isHex" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
<div for="isHex"></div>
</div>
</div>
</div>
<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="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="1" class="required"
<c:if test="${_cfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font>
@@ -207,6 +233,23 @@ $(function(){
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<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">
<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
<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>
</select>
</div>
<div for="isHexbin"></div>
</div>
</div>
</div>
<input name="isAreaEffective" type="hidden" value="0">
<%-- <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
<input name="requestId" value="0" type="hidden">

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

@@ -229,6 +229,49 @@ $(function(){
<div for="matchMethod"></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="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isHex" value="1" class="required"
<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="isHex" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
<div for="isHex"></div>
</div>
</div>
</div>
<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="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="1" class="required"
<c:if test="${_cfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
@@ -244,6 +287,7 @@ $(function(){
<div for="isHexbin"></div>
</div>
</div>
</div>
</div>
<input name="isAreaEffective" type="hidden" value="0">

75
src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
View File

@@ -161,21 +161,6 @@
<div for="cfgKeywords"></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="whether_hexbinary"/></label>
<div class="col-md-6">
<select name="isHexbin" class="selectpicker select2 form-control required" >
<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>
</c:forEach>
</select>
</div>
<div for="isHexbin"></div>
</div>
</div>
</div>
<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="expression_type"/></label>
@@ -194,6 +179,9 @@
<div for="exprType"></div>
</div>
</div>
</div>
<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="match_method"/></label>
@@ -211,6 +199,63 @@
<div for="matchMethod"></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="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isHex" value="1" class="required"
<c:if test="${_cfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="isHex" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
<div for="isHex"></div>
</div>
</div>
</div>
<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="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="1" class="required"
<c:if test="${_cfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="isCaseSenstive" value="0" class="required"
<c:if test="${_cfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="isCaseInsenstive"></div>
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<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" >
<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>
</c:forEach>
</select>
</div>
<div for="isHexbin"></div>
</div>
</div>
</div>
<c:if test="${specialFunctionId ne null and specialFunctionId eq 'domainratelimit'}">
<div class="row">

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

@@ -93,6 +93,46 @@
</div>
</div>
<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="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="1" class="required"
<c:if test="${complexCfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="0" class="required"
<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
<div for="${cfgName}.isHex"></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="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="1" class="required"
<c:if test="${complexCfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
<c:if test="${complexCfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="${cfgName}.isCaseInsenstive"></div>
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>

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

@@ -77,6 +77,46 @@ $(function(){
</div>
</div>
<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="is_hex"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="1" class="required"
<c:if test="${strCfg.isHexbin eq 1}">checked</c:if>
><spring:message code="hex"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isHex" value="0" class="required"
<c:if test="${strCfg.isHexbin ne 1}">checked</c:if>
><spring:message code="not_hex"/>
</label>
</div>
<div for="${cfgName}.isHex"></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="is_case_insenstive"/></label>
<div class="col-md-6">
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="1" class="required"
<c:if test="${strCfg.isHexbin==1}">checked</c:if>
><spring:message code="case_senstive"/>
</label>
<label class="radio-inline">
<input type="radio" name="${cfgName}.isCaseSenstive" value="0" class="required"
<c:if test="${strCfg.isHexbin ne 1}">checked</c:if>
><spring:message code="case_insenstive"/>
</label>
</div>
<div for="${cfgName}.isCaseInsenstive"></div>
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>

45
src/main/webapp/static/global/scripts/common.js
View File

@@ -1,4 +1,13 @@
$(function(){
$("input[name$='isHex']").on("change",function(){
setIsHexBin(this);
});
$("input[name$='isCaseSenstive']").on("change",function(){
setIsHexBin(this);
});
$("input[name$='isHex']:checked").each(function(){
setIsHexBin(this);
});
$("a[name=viewLogInfo]>i").on("click",function(){
var html = "<div class='logInfo'>";
$(this).parents("tr").find("td").each(function(index,element){
@@ -427,6 +436,41 @@ window.onload=function(){
}
//0 非十六进制 大小不敏感 1 十六进制，大小写不敏感 2非十六进制 大小写敏感
var setIsHexBin=function(obj){
var profix="";
if($(obj).attr("name").indexOf(".") > -1){
profix=$(obj).attr("name").substring(0,$(obj).attr("name").indexOf(".")+1);
}
console.log($(obj).attr("name"));
console.log(profix);
var isHex=$("input[name='"+profix+"isHex']:checked").val();
//如果选择十六进制，则必须发小写不敏感
if(isHex == 1){
$("input[name='"+profix+"isCaseSenstive'][value=0]").prop("checked",true);
$("input[name='"+profix+"isCaseSenstive'][value=1]").prop("checked",false);
$("input[name='"+profix+"isCaseSenstive'][value=1]").parent().addClass("hidden");
}else{
$("input[name='"+profix+"isCaseSenstive'][value=1]").parent().removeClass("hidden");
}
var isCaseSenstive=$("input[name='"+profix+"isCaseSenstive']:checked").val();
//设置isHexbin下拉框的值
if(isHex == 0 && isCaseSenstive==0){
$("select[name='"+profix+"isHexbin']").find("option").prop("selected","");
$("select[name='"+profix+"isHexbin']").find("option[value=0]").prop("selected","selected");
}
if(isHex == 1 && isCaseSenstive==0){
$("select[name='"+profix+"isHexbin']").find("option").prop("selected","");
$("select[name='"+profix+"isHexbin']").find("option[value=1]").prop("selected","selected");
}
if(isHex == 0 && isCaseSenstive==1){
$("select[name='"+profix+"isHexbin']").find("option").prop("selected","");
$("select[name='"+profix+"isHexbin']").find("option[value=2]").prop("selected","selected");
}
if($("select[name='"+profix+"isHexbin']").val() == ""){
$("select[name='"+profix+"isHexbin']").find("option[value=0]").prop("selected","selected");
}
}
//选择hex cfgkeywords需校验十六进制
var addHexCheck=function(obj,isHexbin){
if(isHexbin == 1){ //十六进制
@@ -440,6 +484,7 @@ var addHexCheck=function(obj,isHexbin){
//与表达式时，只允许为子串匹配
var setDefaultMatchMethod=function (obj){
var exprType = $(obj).val();
console.log($(obj).parents(".row").parent(".row"));
if(exprType == 1){
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option").removeAttr("selected");
$(obj).parents(".row").parent(".row").find("select[name$='matchMethod']").find("option[value=0]").attr("selected","selected");