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/java/com/nis/domain/configuration/BaseCfg.java

@@ -266,9 +266,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 			List<SysMenu> list = UserUtils.getMenuList();
 			if(!StringUtil.isEmpty(list)) {
 				for (SysMenu menu :list) {
-					if (!StringUtil.isEmpty(menu.getCode()) && !StringUtil.isEmpty(menu.getFunctionId()) &&menu.getFunctionId().equals(functionId)) {
+					if (!StringUtil.isEmpty(menu.getCode()) 
+							&& !StringUtil.isEmpty(menu.getFunctionId()) 
+							&& menu.getFunctionId().equals(functionId)
+							//&& menu.getFunctionId().equals(functionId)
+							) {
 						this.setMenuNameCode(menu.getCode());
-						
+						break;
 					}
 					
 				}