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

src/main/resources/messages/message_en.properties

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

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

@@ -38,7 +38,7 @@
 		        </c:forEach>
            		<sys:treeselect id="classify" name="classify" value="${_cfg.classify}" labelName="classifyName" extId="0"
 				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=""/>
            	 <%-- <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
                	

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

@@ -59,6 +59,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
 																"div[for='"
@@ -67,6 +68,7 @@
 														flag = false;
 													}
 												}				
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

@@ -65,6 +65,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
 																"div[for='"
@@ -73,6 +74,7 @@
 														flag = false;
 													}
 												}						
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

@@ -58,6 +58,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
 																"div[for='"
@@ -66,6 +67,7 @@
 														flag = false;
 													}
 												}					
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

@@ -59,6 +59,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
 																"div[for='"
@@ -67,6 +68,7 @@
 														flag = false;
 													}
 												}					
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

@@ -66,6 +66,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
 																"div[for='"
@@ -74,6 +75,7 @@
 														flag = false;
 													}
 												}						
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

@@ -59,6 +59,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(
 																"div[for='"
@@ -67,6 +68,7 @@
 														flag = false;
 													}
 												}					
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

@@ -104,11 +104,8 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
-													alert($(this).parents(".boxSolid").find(
-															"div[for='"
-															+ $(this).attr("name").replace("isHexbin","cfgKeywords")
-															+ "']").length);
 														$(this).parents(".boxSolid").find(
 																"div[for='"
 																		+ $(this).attr("name").replace("isHexbin","cfgKeywords")
@@ -116,6 +113,7 @@
 														flag = false;
 													}
 												}					
+											}
 										});
 										if(flag){
 											//将disable属性的元素删除

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

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