修改voip、dns响应策略、ip欺骗模块权限bug

系统管理模块所有提示信息增加国际化
增加清空数据sql

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){