diff --git a/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java b/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java index 3c1e4a6..54d7cc1 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/manager/controller/UserController.java @@ -38,141 +38,143 @@ import javax.annotation.Resource; @RequestMapping("/users") public class UserController { - private static final Logger log = LoggerFactory.getLogger("adminLogger"); + private static final Logger log = LoggerFactory.getLogger("adminLogger"); - @Autowired - private UserService userService; - @Autowired - private UserDao userDao; + @Autowired + private UserService userService; + @Autowired + private UserDao userDao; - @Resource - private RedisTemplate redisTemplate; + @Resource + private RedisTemplate redisTemplate; - @RequestMapping("/tokenVerify") - public AjaxRes tokenVerify(String tokens, String loginName){ - System.err.println("tokens:"+tokens); - AjaxRes ajaxRes = new AjaxRes(); - if(StringUtils.isBlank(tokens)){ - ajaxRes.setFailMsg("token不能为空"); - return ajaxRes; - } - Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(LoginUser.class); - redisTemplate.setValueSerializer(serializer); - String key= "tokens:"+tokens; - LoginUser valur = redisTemplate.boundValueOps(key).get(); + @RequestMapping("/tokenVerify") + public AjaxRes tokenVerify(String tokens, String loginName) { + System.err.println("tokens:" + tokens); + AjaxRes ajaxRes = new AjaxRes(); + if (StringUtils.isBlank(tokens)) { + ajaxRes.setFailMsg("token不能为空"); + return ajaxRes; + } + Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(LoginUser.class); + redisTemplate.setValueSerializer(serializer); + String key = "tokens:" + tokens; + LoginUser valur = redisTemplate.boundValueOps(key).get(); - if(valur!=null){ - if(valur.getUsername().equals(loginName)){ - int num = userService.getUserCount(loginName); - String intro = valur.getIntro(); - if(num>0){ - ajaxRes.setSucceedMsg(intro); - //ajaxRes.setSucceedMsg(AesCbcUtils.decrypt(intro)); - }else { - ajaxRes.setFailMsg("系统为未找到符合用户,请联系管理员新增"); - } - }else{ - ajaxRes.setFailMsg("登录名不匹配"); - } - }else{ - ajaxRes.setFailMsg("token失效,未找到有效登录信息"); - } - return ajaxRes; - } + if (valur != null) { + if (valur.getUsername().equals(loginName)) { + int num = userService.getUserCount(loginName); + String intro = valur.getIntro(); + if (num > 0) { + ajaxRes.setSucceedMsg(intro); + //ajaxRes.setSucceedMsg(AesCbcUtils.decrypt(intro)); + } else { + ajaxRes.setFailMsg("系统为未找到符合用户,请联系管理员新增"); + } + } else { + ajaxRes.setFailMsg("登录名不匹配"); + } + } else { + ajaxRes.setFailMsg("token失效,未找到有效登录信息"); + } + return ajaxRes; + } - @LogAnnotation - @PostMapping - @ApiOperation(value = "保存用户") - @PreAuthorize("hasAuthority('sys:user:add')") - public SysUser saveUser(@RequestBody UserDto userDto) { - SysUser u = userService.getUser(userDto.getUsername()); - if (u != null) { - throw new IllegalArgumentException(userDto.getUsername() + "已存在"); - } + @LogAnnotation + @PostMapping + @ApiOperation(value = "保存用户") + @PreAuthorize("hasAuthority('sys:user:add')") + public SysUser saveUser(@RequestBody UserDto userDto) { + SysUser u = userService.getUser(userDto.getUsername()); + if (u != null) { + throw new IllegalArgumentException(userDto.getUsername() + "已存在"); + } - return userService.saveUser(userDto); - } + return userService.saveUser(userDto); + } - @LogAnnotation - @PutMapping - @ApiOperation(value = "修改用户") - @PreAuthorize("hasAuthority('sys:user:add')") - public SysUser updateUser(@RequestBody UserDto userDto) { - return userService.updateUser(userDto); - } + @LogAnnotation + @PutMapping + @ApiOperation(value = "修改用户") + @PreAuthorize("hasAuthority('sys:user:add')") + public SysUser updateUser(@RequestBody UserDto userDto) { + return userService.updateUser(userDto); + } - @LogAnnotation - @PutMapping(params = "headImgUrl") - @ApiOperation(value = "修改头像") - public void updateHeadImgUrl(String headImgUrl) { - SysUser user = UserUtil.getLoginUser(); - UserDto userDto = new UserDto(); - BeanUtils.copyProperties(user, userDto); - userDto.setHeadImgUrl(headImgUrl); + @LogAnnotation + @PutMapping(params = "headImgUrl") + @ApiOperation(value = "修改头像") + public void updateHeadImgUrl(String headImgUrl) { + SysUser user = UserUtil.getLoginUser(); + UserDto userDto = new UserDto(); + BeanUtils.copyProperties(user, userDto); + userDto.setHeadImgUrl(headImgUrl); - userService.updateUser(userDto); - log.debug("{}修改了头像", user.getUsername()); - } + userService.updateUser(userDto); + log.debug("{}修改了头像", user.getUsername()); + } - @LogAnnotation - @PutMapping("/{username}") - @ApiOperation(value = "修改密码") - @PreAuthorize("hasAuthority('sys:user:password')") - public void changePassword(@PathVariable String username, String oldPassword, String newPassword) { - userService.changePassword(username, oldPassword, newPassword); - } + @LogAnnotation + @PutMapping("/{username}") + @ApiOperation(value = "修改密码") + @PreAuthorize("hasAuthority('sys:user:password')") + public void changePassword(@PathVariable String username, String oldPassword, String newPassword) { + userService.changePassword(username, oldPassword, newPassword); + } - @GetMapping - @ApiOperation(value = "用户列表") - @PreAuthorize("hasAuthority('sys:user:query')") - public PageTableResponse listUsers(PageTableRequest request) { - return new PageTableHandler(new PageTableHandler.CountHandler() { + @GetMapping + @ApiOperation(value = "用户列表") + @PreAuthorize("hasAuthority('sys:user:query')") + public PageTableResponse listUsers(PageTableRequest request) { + return new PageTableHandler(new PageTableHandler.CountHandler() { - @Override - public int count(PageTableRequest request) { - return userDao.count(request.getParams()); - } - }, new PageTableHandler.ListHandler() { + @Override + public int count(PageTableRequest request) { + return userDao.count(request.getParams()); + } + }, new PageTableHandler.ListHandler() { - @Override - public List list(PageTableRequest request) { - List list = userDao.list(request.getParams(), request.getOffset(), request.getLimit()); - for (SysUser sysUser : list) { - String phone = sysUser.getPhone(); - if (StringUtils.isNotBlank(phone)) { - sysUser.setPhone(AesCbcUtils.encrypt(phone)); - } - } - return list; - } - }).handle(request); - } + @Override + public List list(PageTableRequest request) { + List list = userDao.list(request.getParams(), request.getOffset(), request.getLimit()); + for (SysUser sysUser : list) { + String phone = sysUser.getPhone(); + if (StringUtils.isNotBlank(phone)) { + sysUser.setPhone(AesCbcUtils.encrypt(phone)); + } + } + return list; + } + }).handle(request); + } - @ApiOperation(value = "当前登录用户") - @GetMapping("/current") - public SysUser currentUser() { - return UserUtil.getLoginUser(); - } + @ApiOperation(value = "当前登录用户") + @GetMapping("/current") + public SysUser currentUser() { + LoginUser loginUser = UserUtil.getLoginUser(); + loginUser.setPassword(null); + return loginUser; + } - @ApiOperation(value = "根据用户id获取用户") - @GetMapping("/{id}") - @PreAuthorize("hasAuthority('sys:user:query')") - public SysUser user(@PathVariable Long id) { - return userDao.getById(id); - } + @ApiOperation(value = "根据用户id获取用户") + @GetMapping("/{id}") + @PreAuthorize("hasAuthority('sys:user:query')") + public SysUser user(@PathVariable Long id) { + return userDao.getById(id); + } - @ApiOperation(value = "根据用户id修改密码") - @PostMapping("/changePassWord") - @ResponseBody - public AjaxRes changePassWord(UserDto userDto) { - AjaxRes ar = new AjaxRes(); - try { - ar = userService.changePassWord(userDto); - } catch (Exception e) { - ar.setFailMsg(GlobalConst.DATA_FAIL); - } - return ar; - } + @ApiOperation(value = "根据用户id修改密码") + @PostMapping("/changePassWord") + @ResponseBody + public AjaxRes changePassWord(UserDto userDto) { + AjaxRes ar = new AjaxRes(); + try { + ar = userService.changePassWord(userDto); + } catch (Exception e) { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } } diff --git a/src/main/resources/static/js/evaluate/project/projectList.js b/src/main/resources/static/js/evaluate/project/projectList.js index 9a1b877..7c351c7 100644 --- a/src/main/resources/static/js/evaluate/project/projectList.js +++ b/src/main/resources/static/js/evaluate/project/projectList.js @@ -124,12 +124,12 @@ function initTable() { '编辑'; - if (d.noAppearingTeamGroupNum === 0) { - text += - '删除'; - } + // if (d.noAppearingTeamGroupNum === 0) { + // text += + // '删除'; + // } return text; }, },