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

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