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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
wangxin
2018-08-07 15:56:10 +08:00
parent 4be46ac31a 3ce8bd2ea8
commit 736d8ba620
10 changed files with 70 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ configuration=Configuration
direction=Direction direction=Direction
protocol=Protocol protocol=Protocol
oneway=Single oneway=Single
twoway=Two-way twoway=Double
arbitrary=Arbitrarily arbitrary=Arbitrarily
basic_config=Basic Configuration basic_config=Basic Configuration
block_config=Configuration Info block_config=Configuration Info

2
src/main/webapp/WEB-INF/include/form/basicInfo.jsp
View File

@@ -38,7 +38,7 @@
</c:forEach> </c:forEach>
<sys:treeselect id="classify" name="classify" value="${_cfg.classify}" labelName="classifyName" extId="0" <sys:treeselect id="classify" name="classify" value="${_cfg.classify}" labelName="classifyName" extId="0"
labelValue="${classifyValue}" labelValue="${classifyValue}"
title="type" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false" title="classification" url="/basics/serviceDictInfo/treeData?itType=1&isShowLeaf=true" notAllowSelectRoot="true" allowClear="true" notAllowSelectParent="false"
checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/> checked="true" cssClass="form-control" checkedPS="" unCheckedPS=""/>
<%-- <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>> <%-- <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>

16
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -59,13 +59,15 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
} flag = false;
}
}
} }
}); });
if(flag){ if(flag){

16
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -65,13 +65,15 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
} flag = false;
}
}
} }
}); });
if(flag){ if(flag){

14
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -58,12 +58,14 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
flag = false;
}
} }
} }
}); });

14
src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
View File

@@ -59,12 +59,14 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
flag = false;
}
} }
} }
}); });

16
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -66,13 +66,15 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
} flag = false;
}
}
} }
}); });
if(flag){ if(flag){

14
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -59,12 +59,14 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
flag = false;
}
} }
} }
}); });

18
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -104,16 +104,14 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
alert($(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").length); + $(this).attr("name").replace("isHexbin","cfgKeywords")
$(this).parents(".boxSolid").find( + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
"div[for='" flag = false;
+ $(this).attr("name").replace("isHexbin","cfgKeywords") }
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
flag = false;
} }
} }
}); });

17
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -59,14 +59,15 @@
var isHexbin=$(this).val(); var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制 if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val(); var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){ if(keywords != ''){
$(this).parents(".boxSolid").find( if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
"div[for='" $(this).parents(".boxSolid").find(
+ $(this).attr("name").replace("isHexbin","cfgKeywords") "div[for='"
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>"); + $(this).attr("name").replace("isHexbin","cfgKeywords")
flag = false; + "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
return; flag = false;
} }
}
} }
}); });
if(flag){ if(flag){