|
@@ -49,7 +49,7 @@ public class SysUserController extends BaseLogController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/saveOrUpdate")
|
|
|
- @SysLog(logType = "用户管理",value = "新增或修改")
|
|
|
+ @SysLog(logType = "用戶管理",value = "新增或修改")
|
|
|
public ResultData saveOrUpdate(@RequestBody User user){
|
|
|
Integer userId = JwtUtil.getId(getToken());
|
|
|
User createUser = userService.getById(userId);
|
|
@@ -75,19 +75,19 @@ public class SysUserController extends BaseLogController {
|
|
|
}
|
|
|
String info = null;
|
|
|
if(user.getId()== null){
|
|
|
- info = String.format(LogInfoKey.baseInfo,"新增",user.getNickName(),"用户");
|
|
|
+ info = String.format(LogInfoKey.baseInfo,"新增",user.getNickName(),"用戶");
|
|
|
}else {
|
|
|
- info = String.format(LogInfoKey.baseInfo,"编辑",user.getNickName(),"用户");
|
|
|
+ info = String.format(LogInfoKey.baseInfo,"編輯",user.getNickName(),"用戶");
|
|
|
user.setCreateTime(null);
|
|
|
user.setUpdateTime(null);
|
|
|
}
|
|
|
- logService.addLog("用户管理",info,getIp(),getToken());
|
|
|
+ logService.addLog("用戶管理",info,getIp(),getToken());
|
|
|
userService.saveOrUpdate(user);
|
|
|
return ResultData.ok();
|
|
|
}
|
|
|
|
|
|
@PostMapping("/list")
|
|
|
- @SysLog(logType = "用户管理",value = "查看用户列表")
|
|
|
+ @SysLog(logType = "用戶管理",value = "查看用戶列表")
|
|
|
public ResultData list(@RequestBody UserRequest param){
|
|
|
param.setToken(getToken());
|
|
|
PageInfo<UserVo> page = userService.getPageByParam(param);
|
|
@@ -102,13 +102,13 @@ public class SysUserController extends BaseLogController {
|
|
|
User byId = userService.getById(param.getId());
|
|
|
if(byId !=null){
|
|
|
userService.removeById(param.getId());
|
|
|
- String info = String.format(LogInfoKey.baseInfo,"删除",byId.getNickName(),"用户");
|
|
|
- logService.addLog("用户管理",info,getIp(),getToken());
|
|
|
+ String info = String.format(LogInfoKey.baseInfo,"删除",byId.getNickName(),"用戶");
|
|
|
+ logService.addLog("用戶管理",info,getIp(),getToken());
|
|
|
}
|
|
|
return ResultData.ok();
|
|
|
}
|
|
|
@PostMapping("/rePassword")
|
|
|
- @SysLog(logType = "用户管理",value = "重置密码")
|
|
|
+ @SysLog(logType = "用戶管理",value = "重置密碼")
|
|
|
public ResultData rePassword(@RequestBody UserRequest param){
|
|
|
if(param.getId() == null){
|
|
|
throw new BusinessException(ResultCode.PARAM_MISS);
|
|
@@ -121,7 +121,7 @@ public class SysUserController extends BaseLogController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/updatePassword")
|
|
|
- @SysLog(logType = "用户管理",value = "修改密码")
|
|
|
+ @SysLog(logType = "用戶管理",value = "修改密碼")
|
|
|
public ResultData updatePassword(@RequestBody UserUpdateRequest param, @RequestHeader String token){
|
|
|
Integer userId = JwtUtil.getId(token);
|
|
|
User user = userService.getById(userId);
|