diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 89d4bf8b6..39fed64ef 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -490,7 +490,7 @@ role_permission=role permission
 task_allot=task allot
 role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4\u7C7B\u578B\:security-role,assignment,user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1
 role_type_info=workflow group user type(task allocation:assignment,management role:security-role,ordinary role:user)
-data_range_info=in special cases,\u8BBE\u7F6E\u4E3A"\u6309\u660E\u7EC6\u8BBE\u7F6E",\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743
+data_range_info=in special cases
 permission_list=permission list
 area_name=area name
 area_code=area code
@@ -515,6 +515,8 @@ selected_clear_success=selected staff clear success!
 cancel_clear=cancel clear!
 sure_clear=clear
 role_no_new=role dont have new staff!
+role_unique=role name is exist
+role_error_info=input error
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=optional
@@ -706,8 +708,8 @@ min_ttl=min ttl
 max_ttl=max ttl
 ttl_unit=unit/s 
 res_group_num=response number
-policy_number_value_valid=\u7B56\u7565\u53F7\u503C\u53EA\u80FD\u4E3A0\uFF0C\u6216\u5927\u4E8E100
-policy_number_value_unique=\u7B56\u7565\u53F7\u5DF2\u5B58\u5728
+policy_number_value_valid=policy number must be 0 or greater than 100
+policy_number_value_unique=policy number is exist
 #=============about Maintenance=========
 #=============some validation===========
 line=line %s
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 2d9f610b5..5d9276714 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -476,7 +476,7 @@ role_permission=role permission
 task_allot=task allot
 role_type_title=activiti\u67093\u79CD\u9884\u5B9A\u4E49\u7684\u7EC4\u7C7B\u578B\:security-role,assignment,user \u5982\u679C\u4F7F\u7528Activiti Explorer,\u9700\u8981security-role\u624D\u80FD\u770B\u5230manage\u9875\u7B7E,\u9700\u8981assignment\u624D\u80FDclaim\u4EFB\u52A1
 role_type_info=workflow group user type(task allocation:assignment,management role:security-role,ordinary role:user)
-data_range_info=in special cases,\u8BBE\u7F6E\u4E3A"\u6309\u660E\u7EC6\u8BBE\u7F6E",\u53EF\u8FDB\u884C\u8DE8\u673A\u6784\u6388\u6743
+data_range_info=in special cases
 permission_list=permission list
 area_name=area name
 area_code=area code
@@ -501,6 +501,8 @@ selected_clear_success=selected staff clear success!
 cancel_clear=cancel clear!
 sure_clear=clear
 role_no_new=role dont have new staff!
+role_unique=role name is exist
+role_error_info=input error
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=optional
@@ -690,8 +692,8 @@ min_ttl=min ttl
 max_ttl=max ttl
 ttl_unit=unit/s 
 res_group_num=response number
-policy_number_value_valid=\u7B56\u7565\u53F7\u503C\u53EA\u80FD\u4E3A0\uFF0C\u6216\u5927\u4E8E100
-policy_number_value_unique=\u7B56\u7565\u53F7\u5DF2\u5B58\u5728
+policy_number_value_valid=policy number must be 0 or greater than 100
+policy_number_value_unique=policy number is exist
 #=============about Maintenance=========
 #=============some validation===========
 line=line %s
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 3eac10dd2..bfd7eced1 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -517,6 +517,8 @@ selected_clear_success=\u5DF2\u9009\u4EBA\u5458\u6E05\u9664\u6210\u529F\uFF01
 cancel_clear=\u53D6\u6D88\u6E05\u9664\u64CD\u4F5C\uFF01
 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
 #==========xitongguanli end======================
 #===============multiole cfg start====================
 optional=\u53EF\u9009
diff --git a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index 682157db6..d0c93067d 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
@@ -53,7 +53,7 @@
 	            <div class="col-md-6">
 	            	<select name="matchMethod" class="selectpicker select2 form-control required" >
 						<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-							<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+							<option value="${matchMethodC.itemCode}" <c:if test="${_cfg.matchMethod==matchMethodC.itemCode || (_cfg.matchMethod==null && matchMethodC.itemCode==0)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
                			</c:forEach>     
 					</select>
 	            </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
index dabef58e2..17df2e780 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
@@ -226,7 +226,7 @@ var delContent=function(contentClassName,addBtnClassName){
 									            <div class="col-md-6">
 									            	<select name="voipAccounts[${status.index }].matchMethod" class="selectpicker select2 form-control required" >
 														<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-															<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==3)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
+															<option value="${matchMethodC.itemCode}" <c:if test="${voipAccount.matchMethod==matchMethodC.itemCode || (voipAccount.matchMethod==null && matchMethodC.itemCode==1)}">selected</c:if>><spring:message code="${matchMethodC.itemValue}"/></option>
 								               			</c:forEach> 
 													</select>
 									            </div>
diff --git a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
index 62b70dc5a..9febc57e8 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuForm.jsp
@@ -46,12 +46,6 @@
 				<div class="portlet-title">
 					<div class="caption">
 						<i class="fa fa-gift"></i><spring:message code="menu"/><shiro:hasPermission name="sys:menu:edit">${not empty menu.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:menu:edit"><spring:message code="show"/></shiro:lacksPermission></div>
-					<div class="tools">
-						<a href="javascript:;" class="collapse"> </a>
-						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
-						<a href="javascript:;" class="reload"> </a>
-						<a href="javascript:;" class="remove"> </a>
-					</div>
 				</div>
 				
 				<div class="portlet-body form">
diff --git a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
index 1ca54abe9..063e7576b 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleForm.jsp
@@ -16,7 +16,7 @@
 					name: {remote: "${ctx}/sys/role/checkName?oldName=" + encodeURIComponent("${role.name}")}
 				},
 				messages: {
-					name: {remote: "角色名已存在"}
+					name: {remote: "<spring:message code='role_unique'/>"}
 				},
 				submitHandler: function(form){
 					var ids = [], nodes = tree.getCheckedNodes(true);
@@ -25,12 +25,12 @@
 					}
 					$("#menuIds").val(ids);
 				
-					loading('正在提交，请稍等...');
+					loading('onloading...');
 					form.submit();
 				},
 				errorContainer: "#messageBox",
 				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
+					$("#messageBox").text("<spring:message code='role_error_info'/>");
 					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
 						error.appendTo(element.parent().parent());
 					} else {
@@ -78,7 +78,7 @@
 		
 		
 	<h3 class="page-title">
-		<spring:message code="menuManage"/>
+		<spring:message code="roleManage"/>
 	</h3>
 
 	<div class="row">
@@ -87,12 +87,6 @@
 				<div class="portlet-title">
 					<div class="caption">
 						<i class="fa fa-gift"></i><shiro:hasPermission name="sys:role:edit"><c:if test="${not empty role.id}"><spring:message code="edit"/></c:if><c:if test="${empty role.id}"><spring:message code="add"/></c:if></shiro:hasPermission><shiro:lacksPermission name="sys:role:edit"><spring:message code="show"/></shiro:lacksPermission></div>
-					<div class="tools">
-						<a href="javascript:;" class="collapse"> </a>
-						<a href="#portlet-config" data-toggle="modal" class="config"> </a>
-						<a href="javascript:;" class="reload"> </a>
-						<a href="javascript:;" class="remove"> </a>
-					</div>
 				</div>
 				
 				<div class="portlet-body form">
diff --git a/src/main/webapp/WEB-INF/views/sys/roleList.jsp b/src/main/webapp/WEB-INF/views/sys/roleList.jsp
index c8b6aa6e1..255a4ab28 100644
--- a/src/main/webapp/WEB-INF/views/sys/roleList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/roleList.jsp
@@ -9,7 +9,6 @@
 	<div class="page-content">
 		<div class="theme-panel hidden-xs hidden-sm">
 		
-			<button type="button" class="btn btn-default">&nbsp;<spring:message code="refresh"/>&nbsp;</button>
 
 			<shiro:hasPermission name="sys:role:edit">
 			<button type="button" class="btn btn-primary"
@@ -29,14 +28,6 @@
 						<div class="caption">
 							<i class="fa fa-cogs"></i><spring:message code="date_list"/>
 						</div>
-						<div class="tools">
-							<a href="javascript:;" class="collapse" data-original-title=""
-								title=""> </a> <a href="#portlet-config" data-toggle="modal"
-								class="config" data-original-title="" title=""> </a> <a
-								href="javascript:;" class="reload" data-original-title=""
-								title=""> </a> <a href="javascript:;" class="remove"
-								data-original-title="" title=""> </a>
-						</div>
 					</div>
 					<div class="portlet-body">
 	
@@ -56,7 +47,7 @@
 											<td>${fns:getDictLabel('SYS_DATA_SCOPE',role.dataScope,'无')}</td>
 											<td title="${role.remark}">${fns:abbr(role.remark,30)}</td>
 											<shiro:hasPermission name="sys:role:edit"><td>
-												<a href="${ctx}/sys/role/assign?id=${role.id}"><spring:message code="allot"/></a>
+												<%--<a href="${ctx}/sys/role/assign?id=${role.id}"><spring:message code="allot"/></a> --%>
 												<a href="${ctx}/sys/role/form?id=${role.id}"><spring:message code="edit"/></a>
 												<a href="${ctx}/sys/role/delete?id=${role.id}" onclick="return confirmx('<spring:message code="sure_delete"/>？', this.href)"><spring:message code="delete"/></a>
 											</td></shiro:hasPermission>