diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
index fb038e509..ae999cfd4 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
@@ -85,7 +85,7 @@ public class DnsIpCfgController extends BaseController {
 		return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId;
 	}
 	@RequestMapping(value = {"/audit"})
-	//@RequiresPermissions(value={"dns:fake:ip:audit"})
+	@RequiresPermissions(value={"dns:fake:ip:audit"})
 	public String audit(Integer isAudit,Integer isValid,String ids
 			,Integer functionId, RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
index b2fbb5478..1d697f12d 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
@@ -107,7 +107,7 @@ public class DnsResStrategyController extends BaseController  {
 	}
 	
 	@RequestMapping(value = {"/audit"})
-	//@RequiresPermissions(value={"dns:res:strategy:audit"})
+	@RequiresPermissions(value={"dns:res:strategy:audit"})
 	public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId,
 			RedirectAttributes redirectAttributes) {
 		if(!StringUtil.isEmpty(ids)){
diff --git a/src/main/java/com/nis/web/controller/sys/DictController.java b/src/main/java/com/nis/web/controller/sys/DictController.java
index 6fc50c174..833261737 100644
--- a/src/main/java/com/nis/web/controller/sys/DictController.java
+++ b/src/main/java/com/nis/web/controller/sys/DictController.java
@@ -68,10 +68,10 @@ public class DictController extends BaseController {
 			dictService.saveOrUpdate(sysDictName);
 			//删除字典缓存
 			CacheUtils.remove(Constants.CACHE_DICT_MAP);
-			addMessage(redirectAttributes, "保存字典成功");
+			addMessage(redirectAttributes, "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "保存字典失败！");
+			addMessage(redirectAttributes, "save_failed");
 		}
 		
 		return "redirect:" + adminPath + "/sys/dict/list";
@@ -85,10 +85,10 @@ public class DictController extends BaseController {
 			dictService.deleteDict(id);
 			//删除字典缓存
 			CacheUtils.remove(Constants.CACHE_DICT_MAP);
-			addMessage(redirectAttributes, "删除字典成功");
+			addMessage(redirectAttributes, "delete_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "删除字典失败！");
+			addMessage(redirectAttributes, "delete_failed");
 		}
 		
 		
diff --git a/src/main/java/com/nis/web/controller/sys/OfficeController.java b/src/main/java/com/nis/web/controller/sys/OfficeController.java
index 706c5a60c..ae1445fa3 100644
--- a/src/main/java/com/nis/web/controller/sys/OfficeController.java
+++ b/src/main/java/com/nis/web/controller/sys/OfficeController.java
@@ -99,7 +99,7 @@ public class OfficeController extends BaseController {
 	public String saveOrUpdate(SysOffice office, Model model, RedirectAttributes redirectAttributes) {
 		
 		officeService.saveOrUpdate(office);
-		addMessage(redirectAttributes, "保存机构'" + office.getName() + "'成功");
+		addMessage(redirectAttributes, "save_success");
 		String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());
 		
 		return "redirect:" + adminPath + "/sys/office/list?id="+id+"&parentIds="+office.getParentIds();
@@ -114,7 +114,7 @@ public class OfficeController extends BaseController {
 //			addMessage(redirectAttributes, "删除机构失败, 不允许删除顶级机构或编号空");
 //		}else{
 			officeService.delete(office);
-			addMessage(redirectAttributes, "删除机构成功");
+			addMessage(redirectAttributes, "delete_success");
 //		}
 		String id = office.getParentId().equals(0l) ? "" : String.valueOf(office.getParentId());
 		
diff --git a/src/main/java/com/nis/web/controller/sys/RoleController.java b/src/main/java/com/nis/web/controller/sys/RoleController.java
index 1b44dbbb7..39d6a3813 100644
--- a/src/main/java/com/nis/web/controller/sys/RoleController.java
+++ b/src/main/java/com/nis/web/controller/sys/RoleController.java
@@ -1,5 +1,7 @@
 package com.nis.web.controller.sys;
 
+import static java.lang.String.format;
+
 import java.util.List;
 import java.util.Map;
 
@@ -131,7 +133,7 @@ public class RoleController extends BaseController {
 				newNum++;
 			}
 		}
-		addMessage(redirectAttributes, "已成功分配 "+newNum+" 个用户"+msg);
+		addMessage(redirectAttributes, "save_success");
 		return "redirect:" + adminPath + "/sys/role/assign?id="+role.getId();
 	}
 	
@@ -141,11 +143,11 @@ public class RoleController extends BaseController {
 	public String saveOrUpdate(SysRole role, Model model, RedirectAttributes redirectAttributes) {
 		
 		if (!"true".equals(checkName(role.getOldName(), role.getName()))){
-			addMessage(model, "保存角色'" + role.getName() + "'失败, 角色名已存在");
+			addMessage(model, "save_failed");
 			return form(role, model);
 		}
 		roleService.saveOrUpdate(role);
-		addMessage(redirectAttributes, "保存角色'" + role.getName() + "'成功");
+		addMessage(redirectAttributes, "save_success");
 		return "redirect:" + adminPath + "/sys/role/?repage";
 	}
 	
@@ -153,7 +155,7 @@ public class RoleController extends BaseController {
 	@RequestMapping(value = "delete")
 	public String delete(SysRole role, RedirectAttributes redirectAttributes) {
 		roleService.deleteRole(role);
-		addMessage(redirectAttributes, "删除角色成功");
+		addMessage(redirectAttributes, "delete_success");
 		return "redirect:" + adminPath + "/sys/role/?repage";
 	}
 	
@@ -191,6 +193,8 @@ public class RoleController extends BaseController {
 		SysRole role = roleService.getRole(roleId);
 		SysUser user = userService.getUser(userId.toString());
 		if (UserUtils.getUser().getId().equals(userId)) {
+			/*format(getMsgProp().get("single_file_upload_size_error").toString(),
+					role.getName(),user.getName());*/
 			addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
 		}else {
 			if (user.getUserRoleList().size() <= 1){
diff --git a/src/main/java/com/nis/web/controller/sys/UserController.java b/src/main/java/com/nis/web/controller/sys/UserController.java
index 31338de3c..e726452ab 100644
--- a/src/main/java/com/nis/web/controller/sys/UserController.java
+++ b/src/main/java/com/nis/web/controller/sys/UserController.java
@@ -97,7 +97,7 @@ public class UserController extends BaseController{
 			return form(user, model);
 		}*/
 		if (!"true".equals(checkLoginName(user.getOldLoginId(), user.getLoginId()))){
-			addMessage(model, "保存用户'" + user.getLoginId() + "'失败，登录名已存在");
+			addMessage(model, "save_failed");
 			return form(user, model);
 		}
 		// 角色数据有效性验证，过滤不在授权内的角色
@@ -115,7 +115,7 @@ public class UserController extends BaseController{
 		if (user.getLoginId().equals(UserUtils.getUser().getLoginId())){
 			UserUtils.clearCache();
 		}
-		addMessage(redirectAttributes, "保存用户'" + user.getLoginId() + "'成功");
+		addMessage(redirectAttributes, "save_success");
 		return "redirect:" + adminPath + "/sys/user/list?repage";
 	}
 	
@@ -125,12 +125,12 @@ public class UserController extends BaseController{
 	public String delete(SysUser user, RedirectAttributes redirectAttributes) {
 		
 		if (UserUtils.getUser().getId().equals(user.getId())){
-			addMessage(redirectAttributes, "删除用户失败, 不允许删除当前用户");
+			addMessage(redirectAttributes, "delete_failed");
 		}else if (user.isAdmin()){
-			addMessage(redirectAttributes, "删除用户失败, 不允许删除超级管理员用户");
+			addMessage(redirectAttributes, "delete_failed_admin");
 		}else{
 			userService.deleteUser(user);
-			addMessage(redirectAttributes, "删除用户成功");
+			addMessage(redirectAttributes, "delete_success");
 		}
 		return "redirect:" + adminPath + "/sys/user/list?repage";
 	}
@@ -240,7 +240,7 @@ public class UserController extends BaseController{
 			currentUser.setEmail(user.getEmail());
 			currentUser.setPhoto(user.getPhoto());
 			userService.updateUserInfo(currentUser);
-			model.addAttribute("message", "保存用户信息成功");
+			model.addAttribute("message", "save_success");
 		}
 		model.addAttribute("user", currentUser);
 		return "/sys/userInfo";
@@ -274,9 +274,9 @@ public class UserController extends BaseController{
 			
 			if (StringUtils.validatePassword(oldPassword, user.getPassword())){
 				userService.updatePasswordById(user.getId(), user.getLoginId(), newPassword);
-				model.addAttribute("message", "修改密码成功");
+				model.addAttribute("message", "update_success");
 			}else{
-				model.addAttribute("message", "修改密码失败，旧密码错误");
+				model.addAttribute("message", "update_failed");
 			}
 		}
 		model.addAttribute("user", user);
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index fc82a66db..4a85ebdff 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -228,8 +228,11 @@ loginName_error=loginName and password error,please try again.
 system_error=system error,please try again later!
 save_success=save success
 save_failed=save failed
+update_success=update success
+update_failed=update failed
 delete_success=delete success
 delete_failed=delete failed
+delete_failed_admin=delete failed,administrator user is not allowed to be deleted
 audit_success=auditing success
 audit_failed=auditing failed
 turning_page=It is turning to the page
@@ -458,6 +461,7 @@ submit_error=configuration submit error,please look at the error info!
 form_validate=form validate success
 entry=entry
 add_entry=add entry
+click_add_entry=click add entry
 maintainable=maintainable
 useable=useable
 click_add=click add
@@ -517,6 +521,10 @@ sure_clear=clear
 role_no_new=role dont have new staff!
 role_unique=role name is exist
 role_error_info=input error
+user=users
+organization=organization
+file_management=file management
+insert=insert
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=optional
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 7b3182b26..b59cbf0df 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -229,8 +229,11 @@ loginName_error=loginName and password error,please try again.
 system_error=system error,please try again later!
 save_success=save success
 save_failed=save failed
+update_success=update success
+update_failed=update failed
 delete_success=delete success
 delete_failed=delete failed
+delete_failed_admin=delete failed,administrator user is not allowed to be deleted
 audit_success=auditing success
 audit_failed=auditing failed
 turning_page=It is turning to the page
@@ -444,6 +447,7 @@ submit_error=configuration submit error,please look at the error info!
 form_validate=form validate success
 entry=entry
 add_entry=add entry
+click_add_entry=click add entry
 maintainable=maintainable
 useable=useable
 click_add=click add
@@ -503,6 +507,10 @@ sure_clear=clear
 role_no_new=role dont have new staff!
 role_unique=role name is exist
 role_error_info=input error
+user=users
+organization=organization
+file_management=file management
+insert=insert
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=optional
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 511b6f996..115850793 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -226,8 +226,11 @@ loginName_error=\u7528\u6237\u6216\u5BC6\u7801\u9519\u8BEF, \u8BF7\u91CD\u8BD5.
 system_error=\u7CFB\u7EDF\u51FA\u73B0\u70B9\u95EE\u9898\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5\uFF01
 save_success=\u4FDD\u5B58\u6210\u529F
 save_failed=\u4FDD\u5B58\u5931\u8D25
+update_success=\u4FEE\u6539\u6210\u529F
+update_failed=\u4FEE\u6539\u5931\u8D25
 delete_success=\u5220\u9664\u6210\u529F
 delete_failed=\u5220\u9664\u5931\u8D25
+delete_failed_admin=\u5220\u9664\u5931\u8D25\uFF0C\u7BA1\u7406\u5458\u7528\u6237\u4E0D\u5141\u8BB8\u5220\u9664
 audit_success=\u5BA1\u6838\u6210\u529F
 audit_failed=\u5BA1\u6838\u5931\u8D25
 turning_page=\u6B63\u5728\u4E3A\u60A8\u8DF3\u8F6C\u9875\u9762
@@ -459,6 +462,7 @@ submit_error=\u63D0\u4EA4\u914D\u7F6E\u51FA\u73B0\u95EE\u9898\uFF0C\u8BF7\u770B\
 form_validate=\u8868\u5355\u9A8C\u8BC1\u6210\u529F\uFF01
 entry=\u8BCD\u6761\u9879
 add_entry=\u6DFB\u52A0\u8BCD\u6761
+click_add_entry=\u70B9\u51FB\u6DFB\u52A0\u8BCD\u6761
 maintainable=\u53EF\u7EF4\u62A4
 useable=\u53EF\u7528
 click_add=\u70B9\u51FB\u6DFB\u52A0
@@ -519,6 +523,10 @@ sure_clear=\u6E05\u9664\u786E\u8BA4
 role_no_new=\u89D2\u8272\u672A\u5206\u914D\u65B0\u6210\u5458\uFF01
 role_unique=\u89D2\u8272\u540D\u79F0\u5DF2\u5B58\u5728
 role_error_info=\u8F93\u5165\u6709\u8BEF\uFF0C\u8BF7\u5148\u66F4\u6B63\u3002
+user=\u7528\u6237
+organization=\u673A\u6784
+file_management=\u6587\u4EF6\u7BA1\u7406
+insert=\u6DFB\u52A0
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=\u53EF\u9009
diff --git a/src/main/resources/sql/truncate_tables.sql b/src/main/resources/sql/truncate_tables.sql
index cfa697bf4..efac919b9 100644
--- a/src/main/resources/sql/truncate_tables.sql
+++ b/src/main/resources/sql/truncate_tables.sql
@@ -1,46 +1,40 @@
-truncate dns_ip_cfg;
-truncate dns_domain_cfg;
-truncate ip_port_cfg;
-truncate http_domain_cfg;
-truncate http_url_cfg;
-truncate http_body_cfg;
-truncate http_req_head_cfg;
-truncate http_res_head_cfg;
-truncate http_ip_cfg;
-truncate mail_from_cfg;
-truncate mail_to_cfg;
-truncate mail_subject_cfg;
-truncate mail_content_cfg;
-truncate mail_attach_name_cfg;
-truncate mail_attach_content_cfg;
-truncate mail_ip_cfg;
-truncate ftp_addr_cfg;
-truncate ftp_file_name_cfg;
-truncate ftp_file_content_cfg;
-truncate ftp_ip_cfg;
-truncate l2tp_ip_cfg;
-truncate l2tp_url_cfg;
-truncate pptp_ip_cfg;
-truncate pptp_url_cfg;
-truncate openvpn_ip_cfg;
-truncate ssh_ip_cfg;
-truncate ssl_cert_cfg;
-truncate ssl_sni_cfg;
-truncate ssl_ip_cfg;
-truncate sip_ip_cfg;
-truncate sip_original_cfg;
-truncate sip_terminal_cfg;
-truncate rtp_ip_cfg;
-truncate mms_ip_cfg;
-truncate mms_url_cfg;
-truncate rtsp_ip_cfg;
-truncate rtsp_url_cfg;
-truncate rtmp_ip_cfg;
-truncate rtmp_url_cfg;
-truncate https_url_cfg;
-truncate https_content_replace_cfg;
-truncate byte_features_cfg;
-truncate num_boundary_cfg;
-truncate complex_keyword_cfg;
-truncate app_id_cfg;
-truncate area_ip_cfg;
\ No newline at end of file
+delete from app_byte_cfg;
+delete from app_domain_cfg;
+delete from app_features_index;
+delete from app_http_cfg;
+delete from app_id_cfg;
+delete from app_ip_cfg;
+delete from app_policy_cfg;
+delete from area_ip_cfg;
+delete from asn_keyword_cfg;
+delete from av_cont_ip_cfg;
+delete from av_cont_url_cfg;
+delete from av_file_sample_cfg;
+delete from av_pic_ip_cfg;
+delete from av_pic_url_cfg;
+delete from av_sign_sample_cfg;
+delete from av_voip_account_cfg;
+delete from av_voip_ip_cfg;
+delete from byte_features_cfg;
+delete from cfg_index_info;
+delete from complex_keyword_cfg;
+delete from config_group_info;
+delete from ddos_ip_cfg;
+delete from dns_domain_cfg;
+delete from dns_ip_cfg;
+delete from dns_res_strategy;
+delete from file_digest_cfg;
+delete from ftp_keyword_cfg;
+delete from http_body_cfg;
+delete from http_req_head_cfg;
+delete from http_res_head_cfg;
+delete from http_url_cfg;
+delete from ip_multiplex_pool_cfg;
+delete from ip_port_cfg;
+delete from l2tp_url_cfg;
+delete from mail_keyword_cfg;
+delete from multiple_cfg_relation;
+delete from num_boundary_cfg;
+delete from policy_group_info;
+delete from pptp_url_cfg;
+delete from ssl_keyword_cfg;
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/sys/ckfinder.tag b/src/main/webapp/WEB-INF/tags/sys/ckfinder.tag
index 6bfb04653..5676cc9da 100644
--- a/src/main/webapp/WEB-INF/tags/sys/ckfinder.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/ckfinder.tag
@@ -7,13 +7,25 @@
 <%@ attribute name="readonly" type="java.lang.Boolean" required="false" description="是否查看模式"%>
 <%@ attribute name="maxWidth" type="java.lang.String" required="false" description="最大宽度"%>
 <%@ attribute name="maxHeight" type="java.lang.String" required="false" description="最大高度"%>
-<ol id="${input}Preview"></ol><c:if test="${!readonly}"><a href="javascript:" onclick="${input}FinderOpen();" class="btn btn-primary">${selectMultiple?'添加':'选择'}</a>&nbsp;<a href="javascript:" onclick="${input}DelAll();" class="btn btn-warning">清除</a></c:if>
+<ol id="${input}Preview"></ol>
+<c:if test="${!readonly}">
+<a href="javascript:" onclick="${input}FinderOpen();" class="btn btn-primary">
+<c:if test="${!selectMultiple}">
+<spring:message code='choose'/>
+</c:if>
+<c:if test="${selectMultiple}">
+<spring:message code='insert'/>
+</c:if>
+</a>&nbsp;
+<a href="javascript:" onclick="${input}DelAll();" class="btn btn-warning">
+<spring:message code='clear'/></a>
+</c:if>
 <script type="text/javascript">
 	function ${input}FinderOpen(){//<c:if test="${type eq 'thumb'}"><c:set var="ctype" value="images"/></c:if><c:if test="${type ne 'thumb'}"><c:set var="ctype" value="${type}"/></c:if>
 		var date = new Date(), year = date.getFullYear(), month = (date.getMonth()+1)>9?date.getMonth()+1:"0"+(date.getMonth()+1);
 		var url = "${ctxStatic}/global/plugins/ckfinder/ckfinder.html?type=${ctype}&start=${ctype}:${uploadPath}/"+year+"/"+month+
-			"/&action=js&func=${input}SelectAction&thumbFunc=${input}ThumbSelectAction&cb=${input}Callback&dts=${type eq 'thumb'?'1':'0'}&sm=${selectMultiple?1:0}";
-		windowOpen(url,"文件管理",1000,700);
+			"/&action=js&func=${input}SelectAction&thumbFunc=${input}ThumbSelectAction&cb=${input}Callback&dts=${type eq 'thumb'?'1':'0'}&sm=${selectMultiple?1:0}&langCode=${cookie.Language.value}";
+		windowOpen(url,"<spring:message code='file_management'/>",1000,700);
 		//top.$.jBox("iframe:"+url+"&pwMf=1", {title: "文件管理", width: 1000, height: 500, buttons:{'关闭': true}});
 	}
 	function ${input}SelectAction(fileUrl, data, allFiles){
@@ -63,7 +75,7 @@
 			}
 		}
 		if ($("#${input}Preview").text() == ""){
-			$("#${input}Preview").html("<li style='list-style:none;padding-top:5px;'>无</li>");
+			$("#${input}Preview").html("<li style='list-style:none;padding-top:5px;'><spring:message code='nothing'/></li>");
 		}
 	}
 	${input}Preview();
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
index 60feacc15..31663a091 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
@@ -130,7 +130,7 @@ label.errorShow {
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -185,7 +185,7 @@ label.errorShow {
 								<div class="col-md-4">
                                     <c:set var="fatherName"><spring:message code="root_node"/></c:set>
 					                <sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue"  labelValue="${serviceDictInfo.parent.serviceDictId eq '0'?fatherName:fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
-										title="菜单" url="/basics/serviceDictInfo/treeData?itType=${itType}" cssClass="required form-control"/>	
+										title="menu" url="/basics/serviceDictInfo/treeData?itType=${itType}" cssClass="required form-control"/>	
  								<label  class="errorShow" style="display: none;"><spring:message code="isLevelNoSure"/></label>
 								</div>
 							</div>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
index e4f8c8809..466a7e458 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictForm.jsp
@@ -87,7 +87,7 @@
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -143,7 +143,7 @@
 								<div class="col-md-4">
 								    <c:set var="fatherName"><spring:message code="root_node"/></c:set>
 					                <sys:treeselect id="sysDictInfo" name="parent.sysDictId" value="${sysDictInfo.parent.sysDictId}" labelName="parent.itemValue" labelValue="${sysDictInfo.parent.sysDictId eq '0'?fatherName:fns:getSysDictInfoById(sysDictInfo.parent.sysDictId).itemValue}"
-										title="菜单" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
+										title="menu" url="/basics/sysDictInfo/treeData?itType=${itType}" extId="${sysDictInfo.sysDictId}" cssClass="required form-control"/>
 								</div>
 							</div>
 							</c:if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 826545423..4f1e7bfc6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -454,11 +454,11 @@
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
 								 <div class="pull-right">
-							 		<shiro:hasPermission name="avVoip:audit">
+							 		<shiro:hasPermission name="avVoip:config">
 							 			<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
-                                    <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow>
+                                    <%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
                                		<shiro:hasPermission name="avVoip:audit">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index bab4b2e3b..12b1d8d3d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -122,6 +122,7 @@
 							 			<sys:delRow url="${ctx}/cfg/dnsIp/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/cfg/dnsIp/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
+							 		<shiro:hasPermission name="dns:fake:ip:audit">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -133,6 +134,7 @@
 												<li><sys:delRow url="${ctx}/cfg/dnsIp/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
 				                            </ul>
 				                         </div>
+                                    </shiro:hasPermission>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
index 508e6ac65..4a2057ee2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -106,6 +106,7 @@
 							 			<sys:delRow url="${ctx}/maintenance/dnsResStrategy/form" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/maintenance/dnsResStrategy/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
+							 		<shiro:hasPermission name="dns:res:strategy:audit">
 	                                    <div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -117,6 +118,7 @@
 												<li><sys:delRow url="${ctx}/maintenance/dnsResStrategy/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
 				                            </ul>
 				                         </div>
+                                    </shiro:hasPermission>
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index a46f1b704..2b1bd7ff4 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -43,7 +43,7 @@
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
index 356086c97..738c0bf1a 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
@@ -54,7 +54,7 @@ function selectP(){
 									},
 									errorContainer : "#messageBox",
 									errorPlacement : function(error, element) {
-										$("#messageBox").text("输入有误，请先更正。");
+										$("#messageBox").text("<spring:message code='enter_error'/>");
 										if (element.is(":checkbox")
 												|| element.is(":radio")
 												|| element.parent().is(
diff --git a/src/main/webapp/WEB-INF/views/sys/areaForm.jsp b/src/main/webapp/WEB-INF/views/sys/areaForm.jsp
index 1d954b766..d76727757 100644
--- a/src/main/webapp/WEB-INF/views/sys/areaForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/areaForm.jsp
@@ -8,12 +8,12 @@
 			$("#name").focus();
 			$("#inputForm").validate({
 				submitHandler: function(form){
-					loading('正在提交，请稍等...');
+					loading('onloading...');
 					form.submit();
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -36,7 +36,7 @@
 			<label class="control-label">上级区域:</label>
 			<div class="controls">
 				<sys:treeselect id="area" name="parent.id" value="${area.parent.id}" labelName="parent.name" labelValue="${area.parent.name}"
-					title="区域" url="/sys/area/treeData" extId="${area.id}" cssClass="" allowClear="true"/>
+					title="area" url="/sys/area/treeData" extId="${area.id}" cssClass="" allowClear="true"/>
 			</div>
 		</div>
 		<div class="control-group">
diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
index 7d6f32fe9..9616e115d 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
@@ -40,27 +40,19 @@
 					}
 			
 				},
-				messages: {
-					'moduleName':{
-						required:'模块名称必须填写'
-					},
-					'mark':{
-						required:'字典标识必须填写'
-					}
-				},
 				submitHandler: function(form){
 					
 					if(!validateItem()) {
 						return false;
 					}
 
-					loading('正在提交，请稍等...');
+					loading('onloading...');
 					form.submit();
 	                
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -75,7 +67,7 @@
 
 			var $itemsObject = $("#items >p:visible");
 			if($itemsObject.length==0){
-				$("#messageBox").text("保存信息出现问题，请添加词条项！").show();
+				$("#messageBox").text("<spring:message code='dict_saveitem_error'/>").show();
 				return false;
 				
 			}else {
@@ -91,7 +83,7 @@
 				});
 				
 				if(!flag){
-					$("#messageBox").text("保存信息出现问题，每个词条标识与值都不能为空！").show();
+					$("#messageBox").text("<spring:message code='dict_saveitem_nullerror'/>").show();
 					return false;
 				}
 				
@@ -119,9 +111,9 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		<button type="button" class="btn btn-default" onclick="history.go(-1)"><spring:message code="back"/></button>
 	</div>
-	<h3 class="page-title">
+	<%-- <h3 class="page-title">
 		<spring:message code="dictManage"/>
-	</h3>
+	</h3> --%>
 		<div class="col-md-12">
 
 	<%-- <ul class="nav nav-tabs">
@@ -176,7 +168,7 @@
 		<div class="form-group">
 			<label class="col-md-3 control-label"><spring:message code="entry"/></label>
 			<div class="col-md-4">
-				<span type="button" class="btn black" title="点击添加词条项" id="btn_add_item">
+				<span type="button" class="btn black" title="<spring:message code="click_add_entry"/>" id="btn_add_item">
 					<i class="icon-plus"></i> <spring:message code="add_entry"/>
 				</span>
 				<span class="help-inline"><font color="red">*</font> </span>
diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
index 084e23c35..b7aff263b 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
@@ -30,7 +30,7 @@
 			animation:true,
 			html:true,
 			placement:'left',
-			title:'修改记录',
+			title:'<spring:message code="edit_record"/>',
 			content:function(){
 				var html = []; 
 				var content = $(this).attr("data-content");
@@ -273,7 +273,7 @@
 	</form:form>
 	</div>
 	
-	<sys:message content="${message}"/>
+	<spring:message code="${message}"/>
 	
 	<table id="contentTable" class="table table-striped table-bordered table-condensed">
 		<thead>
diff --git a/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp b/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp
index b0b7484cf..b7d7ca1c7 100644
--- a/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/ipLocation.jsp
@@ -19,7 +19,7 @@
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
index 9febc57e8..561608de8 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
@@ -8,12 +8,12 @@
 			$("#name").focus();
 			$("#inputForm").validate({
 				submitHandler: function(form){
-					loading('正在提交，请稍等...');
+					loading('onloading...');
 					form.submit();
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -61,7 +61,7 @@
 								<label class="col-md-3 control-label"><spring:message code="parent_menu"></spring:message>:</label>
 								<div class="col-md-4">
 					                <sys:treeselect id="menu" name="parent.id" value="${menu.parent.id}" labelName="parent.name" labelValue="${menu.parent.name}"
-										title="菜单" url="/sys/menu/treeData" extId="${menu.id}" cssClass="required form-control"/>
+										title="menu" url="/sys/menu/treeData" extId="${menu.id}" cssClass="required form-control"/>
 								</div>
 							</div>
 							<div class="form-group">
@@ -128,8 +128,15 @@
 							<div class="form-group">
 								<label class="col-md-3 control-label"><spring:message code="visible"/>:</label>
 								<div class="col-md-4">
-									<form:radiobuttons path="isShow" items="${fns:getDictList('SYS_SHOW_HIDE')}" itemLabel="itemValue" itemValue="itemCode" htmlEscape="false" class="required"/>
+						           	<c:forEach items="${fns:getDictList('SYS_SHOW_HIDE')}" var="isShowC">
+							           	<label class="radio-inline">
+							           		<input type="radio" name="isShow" value="${isShowC.itemCode }" class="required areaControl"
+							           			<c:if test="${menu.isShow==isShowC.itemCode}">checked</c:if>
+							           		><spring:message code="${isShowC.itemValue }"/>
+							           	</label>
+			               			</c:forEach></br>
 									<span class="help-inline"><spring:message code="is_show_sysmenu"/></span>
+						           <div for="isShow"></div>
 								</div>
 							</div>
 							<div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/sys/menuList.jsp b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
index d02a47f49..1f93c2010 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
@@ -18,7 +18,7 @@
 		}).show();
 	});
 	function updateSort() {
-		loading('正在提交，请稍等...');
+		loading('onloading...');
 		$("#listForm").attr("action", "${ctx}/sys/menu/updateSort");
 		$("#listForm").submit();
 	}
diff --git a/src/main/webapp/WEB-INF/views/sys/officeForm.jsp b/src/main/webapp/WEB-INF/views/sys/officeForm.jsp
index e53b32181..26f71040c 100644
--- a/src/main/webapp/WEB-INF/views/sys/officeForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeForm.jsp
@@ -8,15 +8,12 @@
 			$("#name").focus();
 			$("#inputForm").validate({
 				submitHandler: function(form){
-					loading('正在提交，请稍等...');
+					loading('onloading...');
 					form.submit();
 				},
-				messages: {
-					'area.name': {required: "归属区域必填"}
-				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -47,20 +44,20 @@
 	
 	<form:form id="inputForm" modelAttribute="sysOffice" action="${ctx}/sys/office/saveOrUpdate" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>
+		<spring:message code="${message}"/>
 	<div class="form-body">
 		<div class="form-group">
 			<label class="col-md-3 control-label"><spring:message code="parent_org"/>:</label>
 			<div class="col-md-4">
                 <sys:treeselect id="office" name="parent.id" value="${office.parent.id}" labelName="parent.name" labelValue="${office.parent.name}"
-					title="机构" url="/sys/office/treeData" extId="${office.id}" cssClass="form-control" allowClear="${office.currentUser.admin}"/>
+					title="organization" url="/sys/office/treeData" extId="${office.id}" cssClass="form-control" allowClear="${office.currentUser.admin}"/>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="col-md-3 control-label"><spring:message code="belong_area"/>:</label>
 			<div class="col-md-4">
                 <sys:treeselect id="area" name="area.id" value="${office.area.id}" labelName="area.name" labelValue="${office.area.name}"
-					title="区域" url="/sys/area/treeData" cssClass="required form-control"  allowClear="${office.currentUser.admin}"/>
+					title="area" url="/sys/area/treeData" cssClass="required form-control"  allowClear="${office.currentUser.admin}"/>
 			</div>
 					<span class="help-inline"><font color="red">*</font></span>
 		</div>
@@ -114,14 +111,14 @@
 			<label class="col-md-3 control-label"><spring:message code="leader"/>:</label>
 			<div class="col-md-4">
 				 <sys:treeselect id="primaryPerson" name="primaryPerson.id" value="${office.primaryPerson.id}" labelName="office.primaryPerson.name" labelValue="${office.primaryPerson.name}"
-					title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
+					title="user" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="col-md-3 control-label"><spring:message code="vice_leader"/>:</label>
 			<div class="col-md-4">
 				 <sys:treeselect id="deputyPerson" name="deputyPerson.id" value="${office.deputyPerson.id}" labelName="office.deputyPerson.name" labelValue="${office.deputyPerson.name}"
-					title="用户" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
+					title="user" url="/sys/office/treeData?type=6" allowClear="true" notAllowSelectParent="true" cssClass="form-control"/>
 			</div>
 		</div>
 		<div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/sys/officeList.jsp b/src/main/webapp/WEB-INF/views/sys/officeList.jsp
index bf915b76e..f14a486a5 100644
--- a/src/main/webapp/WEB-INF/views/sys/officeList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeList.jsp
@@ -63,7 +63,7 @@
 <%-- 		<shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${sysOffice.id}">机构添加</a></li></shiro:hasPermission> --%>
 <!-- 	</ul> -->
 <div class="table-responsive">
-	<sys:message content="${message}"/>
+	<spring:message code="${message}"/>
 	<table id="treeTable" class="table table-striped table-bordered table-condensed">
 		<thead><tr><th><spring:message code="org_name"/></th><th><spring:message code="belong_area"/></th><th><spring:message code="org_coding"/></th><th><spring:message code="level"/></th><th><spring:message code="org_type"/></th><th><spring:message code="org_duty_type"/></th><th><spring:message code="remarks"/></th><shiro:hasPermission name="sys:office:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr></thead>
 		<tbody id="treeTableList"></tbody>
diff --git a/src/main/webapp/WEB-INF/views/sys/purposeForm.jsp b/src/main/webapp/WEB-INF/views/sys/purposeForm.jsp
index 2d90a5810..7912db77e 100644
--- a/src/main/webapp/WEB-INF/views/sys/purposeForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/purposeForm.jsp
@@ -10,14 +10,14 @@
 				 
 					if(validateForm()){
 						$("input[type='submit']").attr("disabled",true);
-						loading('正在提交，请稍等...');
+						loading('onloading...');
 						form.submit();
 						parent.location.reload();
 					}
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
diff --git a/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp b/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp
index 1ec19616a..083a1ef50 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleAssign.jsp
@@ -44,7 +44,7 @@
 								return false;
 							};
 					    	// 执行保存
-					    	loading('正在提交，请稍等...');
+					    	loading('onloading...');
 					    	var idsArr = "";
 					    	for (var i = 0; i<ids.length; i++) {
 					    		idsArr = (idsArr + ids[i]) + (((i + 1)== ids.length) ? '':',');
diff --git a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
index 063e7576b..3e449aa7a 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
@@ -96,7 +96,7 @@
 						<!-- BEGIN FORM-->
 							<form:form id="inputForm" modelAttribute="sysRole" action="${ctx}/sys/role/saveOrUpdate" method="post" class="form-horizontal">
 								<form:hidden path="id"/>
-								<sys:message content="${message}"/>
+								<spring:message code="${message}"/>
 								
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message code="role_name"/>:</label>
diff --git a/src/main/webapp/WEB-INF/views/sys/roleList.jsp b/src/main/webapp/WEB-INF/views/sys/roleList.jsp
index 255a4ab28..de985c132 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleList.jsp
@@ -38,7 +38,7 @@
 						   <div class="col-md-12">
 							
 							
-								<sys:message content="${message}"/>
+								<spring:message code="${message}"/>
 								<table id="contentTable" class="table table-striped table-bordered table-condensed">
 									<tr><th><spring:message code="role_name"/></th><th><spring:message code="data_range"/></th><th><spring:message code="describe"/></th><shiro:hasPermission name="sys:role:edit"><th><spring:message code="operation"/></th></shiro:hasPermission></tr>
 									<c:forEach items="${list}" var="role">
diff --git a/src/main/webapp/WEB-INF/views/sys/userForm.jsp b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
index 4047868f1..34dadb129 100644
--- a/src/main/webapp/WEB-INF/views/sys/userForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userForm.jsp
@@ -12,21 +12,21 @@
 			$("#inputForm").validate({
 				rules: {
 					loginId: {remote: "${ctx}/sys/user/checkLoginName?oldLoginId=" + encodeURIComponent('${user.loginId}')},
-					'office.name': {officeIsValid: true }
+					'office.name': {officeIsValid: true },
+					'entity.name': {required: true }
 				},
 				messages: {
-					loginId: {remote: "用户登录名已存在"},
-					'office.name': {officeIsValid: "部门不再公司范围内"},
-					'entity.name': {required: "需选择所在单位"},
-					confirmNewPassword: {equalTo: "输入与上面相同的密码"}
+					loginId: {remote: "<spring:message code='name_existed'/>"},
+					'office.name': {officeIsValid: "<spring:message code='company_range'/>"},
+					confirmNewPassword: {equalTo: "<spring:message code='equal_password'/>"}
 				},
 				submitHandler: function(form){
-					loading('正在提交，请稍等...');
+					loading('onloading...');
 					form.submit();
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='enter_error'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -97,7 +97,7 @@
 	<div class="portlet-body form">
 	<form:form id="inputForm" modelAttribute="sysUser" action="${ctx}/sys/user/saveOrUpdate" method="post" class="form-horizontal">
 		<form:hidden path="id"/>
-		<sys:message content="${message}"/>
+		<spring:message code="${message}"/>
 		<div class="form-body">
 		<div class="form-group">
 			<label class="col-md-3 control-label"><spring:message code="name_image"/>:</label>
@@ -125,7 +125,7 @@
 			<label class="col-md-3 control-label"><spring:message code="owner_company"/>:</label>
 			<div class="col-md-4">
                 <sys:treeselect id="company" name="company.id" value="${user.company.id}" labelName="company.name" labelValue="${user.company.name}"
-					title="公司" url="/sys/office/treeData?type=1" cssClass="required  form-control" notAllowSelectRoot="true"/>
+					title="company" url="/sys/office/treeData?type=1" cssClass="required  form-control" notAllowSelectRoot="true"/>
 			</div>
 		</div>
 		
@@ -133,7 +133,7 @@
 			<label class="col-md-3 control-label"><spring:message code="organizer"/>:</label>
 			<div class="col-md-4">
                 <sys:treeselect id="entity" name="entity.id" value="${user.entity.id}" labelName="entity.name" labelValue="${user.entity.name}"
-					title="单位" url="/sys/office/treeData?type=2" cssClass="required form-control" notAllowSelectRoot="true"/>
+					title="organization" url="/sys/office/treeData?type=2" cssClass="required form-control" notAllowSelectRoot="true"/>
 			</div>
 		</div>
 		
@@ -141,7 +141,7 @@
 			<label class="col-md-3 control-label"><spring:message code="owner_group"/>:</label>
 			<div class="col-md-4">
                 <sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name" labelValue="${user.office.name}"
-					title="部门" url="/sys/office/treeData?type=3" cssClass="required form-control" notAllowSelectRoot="true"/>
+					title="group" url="/sys/office/treeData?type=3" cssClass="required form-control" notAllowSelectRoot="true"/>
 			</div>
 		</div>
 		
diff --git a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
index 79a83848e..a509148e0 100644
--- a/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userInfo.jsp
@@ -10,12 +10,12 @@
 						.validate(
 								{
 									submitHandler : function(form) {
-										loading('正在提交，请稍等...');
+										loading('onloading...');
 										form.submit();
 									},
 									errorContainer : "#messageBox",
 									errorPlacement : function(error, element) {
-										$("#messageBox").text("输入有误，请先更正。");
+										$("#messageBox").text("<spring:message code='enter_error'/>");
 										if (element.is(":checkbox")
 												|| element.is(":radio")
 												|| element.parent().is(
diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp
index 8c09d2101..135528e94 100644
--- a/src/main/webapp/WEB-INF/views/sys/userList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp
@@ -101,7 +101,7 @@
 									<label><spring:message code="owner_company"/>：</label>
 									<sys:treeselect id="company" name="company.id"
 										value="${user.company.id}" labelName="company.name"
-										labelValue="${user.company.name}" title="公司"
+										labelValue="${user.company.name}" title="company"
 										url="/sys/office/treeData?type=1" cssClass="form-control"
 										allowClear="true"/>
 								</div>
@@ -113,7 +113,7 @@
 								<div class="form-group">
 									<label><spring:message code="owner_group"/>：</label>
 									<sys:treeselect id="office" name="office.id" value="${user.office.id}" labelName="office.name"
-										labelValue="${user.office.name}" title="部门"
+										labelValue="${user.office.name}" title="group"
 										url="/sys/office/treeData?type=3" cssClass="form-control" allowClear="true"
 										notAllowSelectParent="true"/>
 								</div>
@@ -162,7 +162,7 @@
 
 			</div>
 		</div>
-		<sys:message content="${message}" />
+		<spring:message code="${message}" />
 		<table id="contentTable"
 			class="table table-striped table-bordered table-condensed">
 			<thead>
diff --git a/src/main/webapp/static/global/plugins/ckfinder/ckfinder.html b/src/main/webapp/static/global/plugins/ckfinder/ckfinder.html
index 46017adc9..1fc45fecb 100644
--- a/src/main/webapp/static/global/plugins/ckfinder/ckfinder.html
+++ b/src/main/webapp/static/global/plugins/ckfinder/ckfinder.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
-	<title>文件管理</title>
+	<title></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="robots" content="noindex, nofollow" />
 	<script type="text/javascript" src="ckfinder.js"></script>
@@ -70,7 +70,13 @@
 			config.skin = tmp;
 
 		if ( tmp = get( 'langCode' ) )
-			config.language = tmp;
+			if(tmp=='en'){
+				config.language="en";
+			}else if(tmp=='ru_RU'){
+				config.language="ru";
+			}else{
+				config.language="zh-cn";
+			}
 
 		if ( typeof( config.selectActionFunction ) == 'undefined' )
 		{
diff --git a/src/main/webapp/static/global/plugins/ckfinder/lang/zh-cn.js b/src/main/webapp/static/global/plugins/ckfinder/lang/zh-cn.js
index 78a650f6f..e10290ffc 100644
--- a/src/main/webapp/static/global/plugins/ckfinder/lang/zh-cn.js
+++ b/src/main/webapp/static/global/plugins/ckfinder/lang/zh-cn.js
@@ -68,7 +68,7 @@ CKFinder.lang['zh-cn'] =
 	DateAmPm : ['AM', 'PM'],
 
 	// Folders
-	FoldersTitle	: '文件夹',
+	FoldersTitle	: '文件夹a',
 	FolderLoading	: '正在加载文件夹...',
 	FolderNew		: '请输入新文件夹名称: ',
 	FolderRename	: '请输入新文件夹名称: ',