自动注入HttpServletRequest
This commit is contained in:
@@ -39,7 +39,7 @@ public class SessionListener implements HttpSessionListener {
|
|||||||
HashMap<String, Integer> visitDetail = (HashMap<String, Integer>) se.getSession().getAttribute("visitDetail");
|
HashMap<String, Integer> visitDetail = (HashMap<String, Integer>) se.getSession().getAttribute("visitDetail");
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("ip => ").append(se.getSession().getAttribute("ip"));
|
sb.append("ip => ").append(se.getSession().getAttribute("ip"));
|
||||||
User user = redisUserUtil.get(request);
|
User user = redisUserUtil.get();
|
||||||
sb.append("\t登录情况 => ");
|
sb.append("\t登录情况 => ");
|
||||||
sb.append(user == null ? "游客访问" : user.getEmail());
|
sb.append(user == null ? "游客访问" : user.getEmail());
|
||||||
visitDetail.forEach((s, integer) -> {
|
visitDetail.forEach((s, integer) -> {
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ public class ArticleController {
|
|||||||
ArticleModel article = articleService.retrieveOneByID(articleId, is4update);
|
ArticleModel article = articleService.retrieveOneByID(articleId, is4update);
|
||||||
if (article.getOpen()) {
|
if (article.getOpen()) {
|
||||||
return ResponseUtil.success(article);
|
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.success(article);
|
||||||
}
|
}
|
||||||
return ResponseUtil.response(ResponseEnum.PERMISSION_ERROR, null);
|
return ResponseUtil.response(ResponseEnum.PERMISSION_ERROR, null);
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ public class ArticleServiceImpl implements ArticleService {
|
|||||||
article.setUrl(reqBody.getUrl());
|
article.setUrl(reqBody.getUrl());
|
||||||
article.setType(reqBody.getType());
|
article.setType(reqBody.getType());
|
||||||
|
|
||||||
article.setAuthorId(redisUserUtil.get(request).getId());
|
article.setAuthorId(redisUserUtil.get().getId());
|
||||||
article.setPublishDate(new Date());
|
article.setPublishDate(new Date());
|
||||||
|
|
||||||
//防止出现 “null,xxx”这种情况
|
//防止出现 “null,xxx”这种情况
|
||||||
@@ -198,7 +198,7 @@ public class ArticleServiceImpl implements ArticleService {
|
|||||||
Article nextArticle = articleMapper.findArticleById(articleForDel.getNextArticleId());
|
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())) {
|
if (!user.getRole().contains("admin") && !articleForDel.getAuthorId().equals(user.getId())) {
|
||||||
throw new MyException(ResponseEnum.PERMISSION_ERROR);
|
throw new MyException(ResponseEnum.PERMISSION_ERROR);
|
||||||
}
|
}
|
||||||
@@ -344,7 +344,7 @@ public class ArticleServiceImpl implements ArticleService {
|
|||||||
// 设置不定参数
|
// 设置不定参数
|
||||||
article.setReadingNumber(oldArticle.getReadingNumber());
|
article.setReadingNumber(oldArticle.getReadingNumber());
|
||||||
article.setPublishDate(oldArticle.getPublishDate());
|
article.setPublishDate(oldArticle.getPublishDate());
|
||||||
article.setAuthorId(redisUserUtil.get(request).getId());
|
article.setAuthorId(redisUserUtil.get().getId());
|
||||||
article.setPreArticleId(oldArticle.getPreArticleId());
|
article.setPreArticleId(oldArticle.getPreArticleId());
|
||||||
article.setNextArticleId(oldArticle.getNextArticleId());
|
article.setNextArticleId(oldArticle.getNextArticleId());
|
||||||
String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
|
String str = StringFromHtmlUtil.getString(MDTool.markdown2Html(article.getMdContent()));
|
||||||
@@ -362,7 +362,7 @@ public class ArticleServiceImpl implements ArticleService {
|
|||||||
throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
|
throw new MyException(ResponseEnum.ARTICLE_NOT_EXIST);
|
||||||
}
|
}
|
||||||
if (!article.getOpen()) {
|
if (!article.getOpen()) {
|
||||||
User user = redisUserUtil.getWithOutExc(request);
|
User user = redisUserUtil.getWithOutExc();
|
||||||
if (user == null || "user".equals(user.getRole())) {
|
if (user == null || "user".equals(user.getRole())) {
|
||||||
throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC);
|
throw new MyException(ResponseEnum.ARTICLE_NOT_PUBLIC);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ public class CommentServiceImpl implements CommentService {
|
|||||||
if (reqBody == null) {
|
if (reqBody == null) {
|
||||||
throw new MyException(ResponseEnum.PARAMETERS_ERROR);
|
throw new MyException(ResponseEnum.PARAMETERS_ERROR);
|
||||||
}
|
}
|
||||||
long authorID = redisUserUtil.get(request).getId();
|
long authorID = redisUserUtil.get().getId();
|
||||||
Comment pComment = null;
|
Comment pComment = null;
|
||||||
if (reqBody.getPid() != null && reqBody.getPid() != -1) {
|
if (reqBody.getPid() != null && reqBody.getPid() != -1) {
|
||||||
pComment = commentMapper.findCommentById(reqBody.getPid());
|
pComment = commentMapper.findCommentById(reqBody.getPid());
|
||||||
@@ -147,7 +147,7 @@ public class CommentServiceImpl implements CommentService {
|
|||||||
@Override
|
@Override
|
||||||
public PageInfo<CommentModel> retrievePageByAuthor(Boolean isComment, int page, int count) {
|
public PageInfo<CommentModel> retrievePageByAuthor(Boolean isComment, int page, int count) {
|
||||||
PageHelper.startPage(page, count);
|
PageHelper.startPage(page, count);
|
||||||
List<Comment> commentList = commentMapper.findAllByAuthorIDAndType(redisUserUtil.get(request).getId(), isComment);
|
List<Comment> commentList = commentMapper.findAllByAuthorIDAndType(redisUserUtil.get().getId(), isComment);
|
||||||
PageInfo pageInfo = new PageInfo(commentList);
|
PageInfo pageInfo = new PageInfo(commentList);
|
||||||
pageInfo.setList(list2List(commentList));
|
pageInfo.setList(list2List(commentList));
|
||||||
return pageInfo;
|
return pageInfo;
|
||||||
|
|||||||
@@ -159,7 +159,7 @@ public class UserServiceImpl implements UserService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UserModel update(String desc, String displayName) {
|
public UserModel update(String desc, String displayName) {
|
||||||
User user = redisUserUtil.get(request);
|
User user = redisUserUtil.get();
|
||||||
user.setDesc(desc);
|
user.setDesc(desc);
|
||||||
user.setDisplayName(displayName);
|
user.setDisplayName(displayName);
|
||||||
|
|
||||||
@@ -193,7 +193,7 @@ public class UserServiceImpl implements UserService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object updateUserAavatarImg(InputStream is, String mime) {
|
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());
|
QiniuResponse upload = qiniuService.uploadFile(is, user.getEmail() + "_" + user.getId() + mime.toLowerCase());
|
||||||
user.setAvatarImgUrl(upload.key);
|
user.setAvatarImgUrl(upload.key);
|
||||||
userMapper.updateAvatarImgUrl(upload.key, user.getId());
|
userMapper.updateAvatarImgUrl(upload.key, user.getId());
|
||||||
@@ -203,7 +203,7 @@ public class UserServiceImpl implements UserService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public UserModel getUserInfoBySession() {
|
public UserModel getUserInfoBySession() {
|
||||||
User user = redisUserUtil.get(request);
|
User user = redisUserUtil.get();
|
||||||
return trans(user);
|
return trans(user);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -422,7 +422,7 @@ public class UserServiceImpl implements UserService {
|
|||||||
if (updateResult == 0) {
|
if (updateResult == 0) {
|
||||||
throw new MyException(ResponseEnum.FAILURE);
|
throw new MyException(ResponseEnum.FAILURE);
|
||||||
}
|
}
|
||||||
if (redisUserUtil.get(request).getId().equals(userReq.getId())) {
|
if (redisUserUtil.get().getId().equals(userReq.getId())) {
|
||||||
redisUserUtil.set(user);
|
redisUserUtil.set(user);
|
||||||
}
|
}
|
||||||
logger.info("修改了用户 [id={}] 的用户的资料", userReq.getId());
|
logger.info("修改了用户 [id={}] 的用户的资料", userReq.getId());
|
||||||
|
|||||||
@@ -20,16 +20,18 @@ public class RedisUserUtil {
|
|||||||
RedisUtil redisUtil;
|
RedisUtil redisUtil;
|
||||||
@Autowired
|
@Autowired
|
||||||
JwtUtil jwtUtil;
|
JwtUtil jwtUtil;
|
||||||
|
@Autowired
|
||||||
|
HttpServletRequest request;
|
||||||
|
|
||||||
public User get(HttpServletRequest request) {
|
public User get() {
|
||||||
User user = getWithOutExc(request);
|
User user = getWithOutExc();
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
throw new MyException(ResponseEnum.HAVE_NOT_LOG_IN);
|
throw new MyException(ResponseEnum.HAVE_NOT_LOG_IN);
|
||||||
}
|
}
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
public User getWithOutExc(HttpServletRequest request) {
|
public User getWithOutExc() {
|
||||||
String token = request.getHeader("Authorization");
|
String token = request.getHeader("Authorization");
|
||||||
if (token == null || token.isEmpty()) {
|
if (token == null || token.isEmpty()) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user