Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	
	业务配置的list和form的标题取自菜单的国际化code;
	修改dns ssl P2P mail ftp无subscribe时，无预配置也可提交的bug

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

@@ -45,8 +45,12 @@
 										if($(".boxSolid.hidden").hasClass("subscribeId")){
 											subscribeId=1;
 										}
+										var boxSolidLenth=$(".boxSolid").length;
+										if($(".boxSolid").hasClass("subscribeId")){
+											boxSolidLenth=boxSolidLenth-1;
+										}
 										//代表所有业务都隐藏了，提示必须增加一种业务数据
-										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
+										if(boxSolidLenth ==($(".boxSolid.hidden").length-subscribeId)){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
@@ -134,9 +138,9 @@
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<div class="page-content">
-	<%-- 	<h3 class="page-title">
-			<spring:message code="mail_control"></spring:message>
-		</h3> --%>
+	 	<h3 class="page-title">
+			<spring:message code="${_cfg.menuNameCode }"></spring:message>
+		</h3>
 		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="mail_note"></spring:message></span>
 		<div class="row">
 			<div class="col-md-12">