diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java index 788e2d43..50ff7cda 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserFeign.java @@ -162,9 +162,9 @@ public interface SysUserFeign { @PostMapping("/selectBySid") public ResultBean selectBySid(@RequestParam("sid") String sid); - @PostMapping(value = "/loginDetails", headers = "token") + @PostMapping(value = "/loginDetailsNew") @ApiOperation("根据token值获取登录后的用户信息") - public ResultBean loginDetails(HttpServletRequest httpServletRequest); + public ResultBean loginDetailsNew(@RequestHeader("token")String token); @ApiOperation(value = "根据用户sid获取orgSid(多个时取第一个)") @ResponseBody diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java index b4134bf3..6d991afb 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java @@ -592,7 +592,7 @@ public class SysUserRest implements SysUserFeign { return rb.success().setData(vo); } - @Override +// @Override public ResultBean loginDetails(HttpServletRequest httpServletRequest) { String token = httpServletRequest.getHeader("token"); if (StringUtils.isBlank(token)) { @@ -609,7 +609,23 @@ public class SysUserRest implements SysUserFeign { } return new ResultBean().success().setData(userInfoOneVo); } - + @Override + public ResultBean loginDetailsNew(@RequestHeader("token")String token) { +// String token = httpServletRequest.getHeader("token"); + if (StringUtils.isBlank(token)) { + return new ResultBean().fail().setMsg("请重新登录"); + } + String userName = redisUtil.get(token); + if (StringUtils.isBlank(userName)) { + return new ResultBean().fail().setMsg("请重新登录"); + } + SysUser user = sysUserService.selectByUserName(userName); + SysUserVo userInfoOneVo = sysUserService.selectUserOne(user); + if (userInfoOneVo == null) { + return new ResultBean().fail().setMsg("该用户不是公司员工"); + } + return new ResultBean().success().setData(userInfoOneVo); + } @Override public ResultBean getUserOrgInfoByUserSid(String userSid) { AppUserOrgInfoVo vo = sysUserService.getUserOrgInfoByUserSid(userSid);