From 450f308f1e5c532caa09091cb7341ad33ba4131a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=B5=B7?= Date: Wed, 4 Dec 2019 14:43:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B3=A8=E5=85=A5HttpServlet?= =?UTF-8?q?Request?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blog/configuration/listener/SessionListener.java | 2 +- .../java/cn/celess/blog/controller/ArticleController.java | 2 +- .../blog/service/serviceimpl/ArticleServiceImpl.java | 8 ++++---- .../blog/service/serviceimpl/CommentServiceImpl.java | 4 ++-- .../celess/blog/service/serviceimpl/UserServiceImpl.java | 8 ++++---- src/main/java/cn/celess/blog/util/RedisUserUtil.java | 8 +++++--- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/cn/celess/blog/configuration/listener/SessionListener.java b/src/main/java/cn/celess/blog/configuration/listener/SessionListener.java index 26b2bd3..7096bd4 100644 --- a/src/main/java/cn/celess/blog/configuration/listener/SessionListener.java +++ b/src/main/java/cn/celess/blog/configuration/listener/SessionListener.java @@ -39,7 +39,7 @@ public class SessionListener implements HttpSessionListener { HashMap visitDetail = (HashMap) se.getSession().getAttribute("visitDetail"); StringBuilder sb = new StringBuilder(); sb.append("ip => ").append(se.getSession().getAttribute("ip")); - User user = redisUserUtil.get(request); + User user = redisUserUtil.get(); sb.append("\t登录情况 => "); sb.append(user == null ? "游客访问" : user.getEmail()); visitDetail.forEach((s, integer) -> { diff --git a/src/main/java/cn/celess/blog/controller/ArticleController.java b/src/main/java/cn/celess/blog/controller/ArticleController.java index 09f58ef..a8177d2 100644 --- a/src/main/java/cn/celess/blog/controller/ArticleController.java +++ b/src/main/java/cn/celess/blog/controller/ArticleController.java @@ -83,7 +83,7 @@ public class ArticleController { ArticleModel article = articleService.retrieveOneByID(articleId, is4update); if (article.getOpen()) { return ResponseUtil.success(article); - } else if (article.getAuthorId().equals(redisUserUtil.get(request).getId())) { + } else if (article.getAuthorId().equals(redisUserUtil.get().getId())) { return ResponseUtil.success(article); } return ResponseUtil.response(ResponseEnum.PERMISSION_ERROR, null); diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java index 5c81ee0..7bd3967 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/ArticleServiceImpl.java @@ -92,7 +92,7 @@ public class ArticleServiceImpl implements ArticleService { article.setUrl(reqBody.getUrl()); article.setType(reqBody.getType()); - article.setAuthorId(redisUserUtil.get(request).getId()); + article.setAuthorId(redisUserUtil.get().getId()); article.setPublishDate(new Date()); //防止出现 “null,xxx”这种情况 @@ -198,7 +198,7 @@ public class ArticleServiceImpl implements ArticleService { Article nextArticle = articleMapper.findArticleById(articleForDel.getNextArticleId()); //对访问情况进行判断 非博主/非自己文章 拒绝访问 - User user = redisUserUtil.get(request); + User user = redisUserUtil.get(); if (!user.getRole().contains("admin") && !articleForDel.getAuthorId().equals(user.getId())) { throw new MyException(ResponseEnum.PERMISSION_ERROR); } @@ -344,7 +344,7 @@ public class ArticleServiceImpl implements ArticleService { // 设置不定参数 article.setReadingNumber(oldArticle.getReadingNumber()); article.setPublishDate(oldArticle.getPublishDate()); - article.setAuthorId(redisUserUtil.get(request).getId()); + article.setAuthorId(redisUserUtil.get().getId()); article.setPreArticleId(oldArticle.getPreArticleId()); article.setNextArticleId(oldArticle.getNextArticleId()); String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent())); @@ -362,7 +362,7 @@ public class ArticleServiceImpl implements ArticleService { throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST); } if (!article.getOpen()) { - User user = redisUserUtil.getWithOutExc(request); + User user = redisUserUtil.getWithOutExc(); if (user == null || "user".equals(user.getRole())) { throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC); } diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java index 0c54937..8c00f7b 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/CommentServiceImpl.java @@ -44,7 +44,7 @@ public class CommentServiceImpl implements CommentService { if (reqBody == null) { throw new MyException(ResponseEnum.PARAMETERS_ERROR); } - long authorID = redisUserUtil.get(request).getId(); + long authorID = redisUserUtil.get().getId(); Comment pComment = null; if (reqBody.getPid() != null && reqBody.getPid() != -1) { pComment = commentMapper.findCommentById(reqBody.getPid()); @@ -147,7 +147,7 @@ public class CommentServiceImpl implements CommentService { @Override public PageInfo retrievePageByAuthor(Boolean isComment, int page, int count) { PageHelper.startPage(page, count); - List commentList = commentMapper.findAllByAuthorIDAndType(redisUserUtil.get(request).getId(), isComment); + List commentList = commentMapper.findAllByAuthorIDAndType(redisUserUtil.get().getId(), isComment); PageInfo pageInfo = new PageInfo(commentList); pageInfo.setList(list2List(commentList)); return pageInfo; diff --git a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java index 07eb7b6..3378bc8 100644 --- a/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java +++ b/src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java @@ -159,7 +159,7 @@ public class UserServiceImpl implements UserService { @Override public UserModel update(String desc, String displayName) { - User user = redisUserUtil.get(request); + User user = redisUserUtil.get(); user.setDesc(desc); user.setDisplayName(displayName); @@ -193,7 +193,7 @@ public class UserServiceImpl implements UserService { @Override public Object updateUserAavatarImg(InputStream is, String mime) { - User user = redisUserUtil.get(request); + User user = redisUserUtil.get(); QiniuResponse upload = qiniuService.uploadFile(is, user.getEmail() + "_" + user.getId() + mime.toLowerCase()); user.setAvatarImgUrl(upload.key); userMapper.updateAvatarImgUrl(upload.key, user.getId()); @@ -203,7 +203,7 @@ public class UserServiceImpl implements UserService { @Override public UserModel getUserInfoBySession() { - User user = redisUserUtil.get(request); + User user = redisUserUtil.get(); return trans(user); } @@ -422,7 +422,7 @@ public class UserServiceImpl implements UserService { if (updateResult == 0) { throw new MyException(ResponseEnum.FAILURE); } - if (redisUserUtil.get(request).getId().equals(userReq.getId())) { + if (redisUserUtil.get().getId().equals(userReq.getId())) { redisUserUtil.set(user); } logger.info("修改了用户 [id={}] 的用户的资料", userReq.getId()); diff --git a/src/main/java/cn/celess/blog/util/RedisUserUtil.java b/src/main/java/cn/celess/blog/util/RedisUserUtil.java index 935c725..fbcc15c 100644 --- a/src/main/java/cn/celess/blog/util/RedisUserUtil.java +++ b/src/main/java/cn/celess/blog/util/RedisUserUtil.java @@ -20,16 +20,18 @@ public class RedisUserUtil { RedisUtil redisUtil; @Autowired JwtUtil jwtUtil; + @Autowired + HttpServletRequest request; - public User get(HttpServletRequest request) { - User user = getWithOutExc(request); + public User get() { + User user = getWithOutExc(); if (user == null) { throw new MyException(ResponseEnum.HAVE_NOT_LOG_IN); } return user; } - public User getWithOutExc(HttpServletRequest request) { + public User getWithOutExc() { String token = request.getHeader("Authorization"); if (token == null || token.isEmpty()) { return null;