diff --git a/buildImage b/buildImage index f66ce37..7a0c4bd 100644 --- a/buildImage +++ b/buildImage @@ -16,6 +16,8 @@ docker run -p 8088:8088 -d monitor/centos:latest docker run --network host -p 8088:8088 -d monitor/centos:latest +docker run --network host -e TZ=Asia/Shanghai -p 8088:8088 -d monitor/centos:latest + docker run -it monitor/centos:latest /bin/bash docker inspect & docker info diff --git a/src/main/java/com/quinn/controller/BlogController.java b/src/main/java/com/quinn/controller/BlogController.java index bc34861..2249248 100644 --- a/src/main/java/com/quinn/controller/BlogController.java +++ b/src/main/java/com/quinn/controller/BlogController.java @@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -125,12 +126,12 @@ public class BlogController extends BaseModelController{ // 阅读文章 @GetMapping("/blog/read/{bid}") public String read(HttpServletRequest request, @PathVariable("bid") String bid, Model model){ - Blog blog = blogService.getOne(new QueryWrapper().eq("bid", bid)); + String loginUserId = getLoginUserId(request); String sessionId = getSessionId(request); - blogService.addRecord(blog,sessionId); - model.addAttribute("blog",blog); + BlogWithUser readBlog = blogService.getReadBlog(bid, sessionId, loginUserId); + model.addAttribute("blog",readBlog); - StarValue starValue = starService.isStar(bid, getLoginUserId(request), Category.BLOG); + StarValue starValue = starService.isStar(bid, loginUserId, Category.BLOG); model.addAttribute("starValue",starValue); List commentList = commentService.getCommentList(bid, Category.BLOG); diff --git a/src/main/java/com/quinn/mapper/BlogMapper.java b/src/main/java/com/quinn/mapper/BlogMapper.java index 92fee71..ef9fd17 100644 --- a/src/main/java/com/quinn/mapper/BlogMapper.java +++ b/src/main/java/com/quinn/mapper/BlogMapper.java @@ -24,4 +24,6 @@ public interface BlogMapper extends BaseMapper { List getBlogWithUserOrderBySort(String userId,MyPageParam myPageParam); List getMyBlogs(String userId,MyPageParam myPageParam); + + BlogWithUser getReadBlog(String bid, String userId); } diff --git a/src/main/java/com/quinn/mapper/xml/BlogMapper.xml b/src/main/java/com/quinn/mapper/xml/BlogMapper.xml index 16e37ee..b9fa945 100644 --- a/src/main/java/com/quinn/mapper/xml/BlogMapper.xml +++ b/src/main/java/com/quinn/mapper/xml/BlogMapper.xml @@ -5,7 +5,7 @@ @@ -34,4 +34,14 @@ limit #{myPageParam.pageNum},#{myPageParam.size} + + diff --git a/src/main/java/com/quinn/mapper/xml/FindMapper.xml b/src/main/java/com/quinn/mapper/xml/FindMapper.xml index 3acbd13..0179712 100644 --- a/src/main/java/com/quinn/mapper/xml/FindMapper.xml +++ b/src/main/java/com/quinn/mapper/xml/FindMapper.xml @@ -9,8 +9,9 @@ or a.content_json like CONCAT('%',#{findWhat},'%') union all select 1 from qn_blog b - where b.title like CONCAT('%',#{findWhat},'%') - or b.content_json like CONCAT('%',#{findWhat},'%') + where (b.title like CONCAT('%',#{findWhat},'%') + or b.content_json like CONCAT('%',#{findWhat},'%')) + and b.category_id = '2' ) t diff --git a/src/main/java/com/quinn/service/BlogService.java b/src/main/java/com/quinn/service/BlogService.java index 07c7164..a9c4317 100644 --- a/src/main/java/com/quinn/service/BlogService.java +++ b/src/main/java/com/quinn/service/BlogService.java @@ -24,5 +24,6 @@ public interface BlogService extends IService { List getMyBlogs(String userId,MyPageParam myPageParam); - void addRecord(Blog blog, String sessionId); + BlogWithUser getReadBlog(String bid,String sessionId,String userId); + } diff --git a/src/main/java/com/quinn/service/impl/BlogServiceImpl.java b/src/main/java/com/quinn/service/impl/BlogServiceImpl.java index 30401e6..73ad343 100644 --- a/src/main/java/com/quinn/service/impl/BlogServiceImpl.java +++ b/src/main/java/com/quinn/service/impl/BlogServiceImpl.java @@ -56,14 +56,23 @@ public class BlogServiceImpl extends ServiceImpl implements Bl return blogMapper.getMyBlogs(userId,myPageParam); } - @Override - public void addRecord(Blog blog, String sessionId) { - String value = redisUtils.get(sessionId + blog.getBid()); + private void addRecord(BlogWithUser blogRead, String sessionId) { + String value = redisUtils.get(sessionId + blogRead.getBid()); + Blog blog = new Blog(); + blog.setBid(blogRead.getBid()); if (!QuinnConstant.SESSION_VIEW_KEY.equals(value)){ - blog.setViews(blog.getViews()+1); + blog.setViews(blogRead.getViews()+1); redisUtils.set(sessionId + blog.getBid(),QuinnConstant.SESSION_VIEW_KEY,QuinnConstant.SESSION_TIME_OUT); updateById(blog); } } + @Override + public BlogWithUser getReadBlog(String bid, String sessionId, String userId) { + BlogWithUser blog = blogMapper.getReadBlog(bid,userId); + if (blog!=null){ + addRecord(blog,sessionId); + } + return blog; + } } diff --git a/src/main/resources/templates/blog/read.html b/src/main/resources/templates/blog/read.html index e08073a..72d163d 100644 --- a/src/main/resources/templates/blog/read.html +++ b/src/main/resources/templates/blog/read.html @@ -32,14 +32,31 @@