gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
系统管理模块所有提示信息增加国际化
增加清空数据sql
This commit is contained in:
duandongmei
2018-07-09 15:49:03 +08:00
parent f75b25502e
commit 2203786946
35 changed files with 179 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java
View File

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

2
src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java
View File

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

8
src/main/java/com/nis/web/controller/sys/DictController.java
View File

@@ -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");
}

4
src/main/java/com/nis/web/controller/sys/OfficeController.java
View File

@@ -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());

12
src/main/java/com/nis/web/controller/sys/RoleController.java
View File

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

16
src/main/java/com/nis/web/controller/sys/UserController.java
View File

@@ -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);