diff --git a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java index db66592..2a3ac90 100644 --- a/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java +++ b/boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java @@ -93,7 +93,7 @@ public class SysUserService { throw new BusinessException("该用户不存在"); } String token = ThreadLocalUtil.getToken(); - String userName = (String) CommonDataUtil.getToken(token); + String userName = (String) CommonDataUtil.getData(token); if (old.getUserName().equals(userName)) { throw new BusinessException("不能删除当前登录用户"); } @@ -126,7 +126,7 @@ public class SysUserService { throw new BusinessException("该用户不存在"); } String token = ThreadLocalUtil.getToken(); - String userName = (String) CommonDataUtil.getToken(token); + String userName = (String) CommonDataUtil.getData(token); if (old.getUserName().equals(userName)) { throw new BusinessException("不能修改当前登录用户"); } @@ -204,7 +204,7 @@ public class SysUserService { throw new BusinessException("未查询到用户信息"); } String token = ThreadLocalUtil.getToken(); - String userName = (String) CommonDataUtil.getToken(token); + String userName = (String) CommonDataUtil.getData(token); if (old.getUserName().equals(userName)) { throw new BusinessException("不能重置当前登录用户"); } @@ -271,7 +271,7 @@ public class SysUserService { */ public RestMessage login(HttpServletRequest request, String userName, String passWord, String checkCode) { RestMessage restMessage = new RestMessage(); -// String imgCode = (String) CommonDataUtil.getToken(CommonConstant.KEY_CAPTCHA); +// String imgCode = (String) CommonDataUtil.getData(CommonConstant.KEY_CAPTCHA); HttpSession session = request.getSession(); String imgCode = (String) session.getAttribute(CommonConstant.KEY_CAPTCHA); //验证验证码 @@ -301,7 +301,7 @@ public class SysUserService { //保存登录数据 //rsa加密后密文是多行的,所以再次url编码 String token = EncodeUtils.urlEncode(RSAUtil.encrypt(userName + "_" + ip)); - CommonDataUtil.setToken(token, userName); + CommonDataUtil.setData(token, userName); restMessage.setData(token); restMessage.setSuccess(true); restMessage.setMessage("登录成功"); @@ -317,11 +317,11 @@ public class SysUserService { public RestMessage logout(HttpServletRequest request) { RestMessage restMessage = new RestMessage(); String token = ThreadLocalUtil.getToken(); - String userName = (String) CommonDataUtil.getToken(token); + String userName = (String) CommonDataUtil.getData(token); SysUser user = getByUserName(userName); if (user != null) { //清空缓存数据 - CommonDataUtil.removeToken(token); + CommonDataUtil.removeData(token); //保存登出信息 SysUserLoginInOut loginInOut = new SysUserLoginInOut(); loginInOut.setCreateTime(new Date()); diff --git a/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java b/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java index e44dc0b..c953c71 100644 --- a/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java @@ -13,19 +13,19 @@ public class CommonDataUtil { private CommonDataUtil() { } - public static Object getToken(String key) { + public static Object getData(String key) { return token.get(key); } - public static void setToken(String key, Object value) { + public static void setData(String key, Object value) { token.put(key, value); } - public static void removeToken(String key) { + public static void removeData(String key) { token.remove(key); } - public static void clearMap() { + public static void clearData() { token.clear(); } } diff --git a/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java index 486e29a..2449b7e 100644 --- a/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java +++ b/boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java @@ -35,7 +35,7 @@ public class CaptchaServlet extends HttpServlet { BufferedImage image = tool.genRandomCodeImage(code); HttpSession session = req.getSession(); session.setAttribute(CommonConstant.KEY_CAPTCHA, code.toString()); -// CommonDataUtil.setToken(CommonConstant.KEY_CAPTCHA, code.toString()); +// CommonDataUtil.setData(CommonConstant.KEY_CAPTCHA, code.toString()); // 将内存中的图片通过流形式输出到客户端 OutputStream out = res.getOutputStream(); ImageIO.write(image, "JPEG", out); diff --git a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java index 0c95cf5..e33266d 100644 --- a/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java +++ b/boot-web/src/main/java/com/xwbing/controller/sys/SysUserControl.java @@ -153,7 +153,7 @@ public class SysUserControl { @GetMapping("getLoginUserInfo") public JSONObject getLoginUserInfo() { String token = ThreadLocalUtil.getToken(); - String userName = (String) CommonDataUtil.getToken(token); + String userName = (String) CommonDataUtil.getData(token); SysUser sysUser = sysUserService.getByUserName(userName); if (sysUser == null) { return JsonResult.toJSONObj("未获取到当前登录用户信息"); diff --git a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java b/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java index 74cc35f..e5fa03e 100644 --- a/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java +++ b/boot-web/src/main/java/com/xwbing/handler/LoginInterceptor.java @@ -52,14 +52,14 @@ public class LoginInterceptor extends HandlerInterceptorAdapter { String token = request.getHeader("token"); if (session == null) { getOutputStream(response, "登录超时,请重新登录"); - CommonDataUtil.removeToken(token); + CommonDataUtil.removeData(token); return false; } else { if (StringUtils.isEmpty(token)) { getOutputStream(response, "token不能为空"); return false; } else { - if (CommonDataUtil.getToken(token) != null) { + if (CommonDataUtil.getData(token) != null) { ThreadLocalUtil.setToken(token); return true; } else {