Merge remote-tracking branch 'origin/fix-issue#36'

# Conflicts:
#	src/main/resources/application.yml

src/main/java/cn/meteor/beyondclouds/modules/blog/mapper/BlogTagMapper.java

@@ -19,7 +19,7 @@ import java.util.Collection;
 public interface BlogTagMapper extends BaseMapper<BlogTag> {
 public interface BlogTagMapper extends BaseMapper<BlogTag> {
 
 
     /**
     /**
-     * 根据博客ID获取相关的博客ids
+     * 根据标签ID获取相关的博客ids
      * @param page
      * @param page
      * @param tagIds
      * @param tagIds
      * @return
      * @return

src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java

@@ -517,7 +517,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
             return PageUtils.emptyPage();
             return PageUtils.emptyPage();
         }
         }
 
 
-        // 如果博客没有引用了标签，则查询引用的标签下的所有博客ID的分页
+        // 如果博客引用了标签，则查询引用的标签下的所有博客ID的分页
         IPage<String> page = new Page<>(pageNumber, pageSize);
         IPage<String> page = new Page<>(pageNumber, pageSize);
         IPage<String> blogIdPage = blogTagService.getRelatedBlogIds(page, tagIds);
         IPage<String> blogIdPage = blogTagService.getRelatedBlogIds(page, tagIds);
         List<String> blogIds = blogIdPage.getRecords();
         List<String> blogIds = blogIdPage.getRecords();

src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogTagServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.Collection;
 import java.util.Collection;
@@ -24,6 +25,7 @@ public class BlogTagServiceImpl extends ServiceImpl<BlogTagMapper, BlogTag> impl
 
 
     private BlogTagMapper blogTagMapper;
     private BlogTagMapper blogTagMapper;
 
 
+    @Autowired
     public BlogTagServiceImpl(BlogTagMapper blogTagMapper) {
     public BlogTagServiceImpl(BlogTagMapper blogTagMapper) {
         this.blogTagMapper = blogTagMapper;
         this.blogTagMapper = blogTagMapper;
     }
     }

src/main/java/cn/meteor/beyondclouds/modules/post/entity/Post.java

@@ -44,6 +44,12 @@ public class Post implements Serializable {
     @ApiModelProperty(value = "动态中的视频")
     @ApiModelProperty(value = "动态中的视频")
     private String video;
     private String video;
 
 
+    @ApiModelProperty(value = "用户头像")
+    private String userAvatar;
+
+    @ApiModelProperty(value = "用户昵称")
+    private String userNick;
+
     private Date createTime;
     private Date createTime;
 
 
     private Date updateTime;
     private Date updateTime;

src/main/java/cn/meteor/beyondclouds/modules/post/mapper/PostMapper.java

 package cn.meteor.beyondclouds.modules.post.mapper;
 package cn.meteor.beyondclouds.modules.post.mapper;
 
 
 import cn.meteor.beyondclouds.modules.post.entity.Post;
 import cn.meteor.beyondclouds.modules.post.entity.Post;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -12,5 +16,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2020-01-30
  * @since 2020-01-30
  */
  */
 public interface PostMapper extends BaseMapper<Post> {
 public interface PostMapper extends BaseMapper<Post> {
-
 }
 }

src/main/java/cn/meteor/beyondclouds/modules/post/service/impl/PostServiceImpl.java

@@ -6,11 +6,15 @@ import cn.meteor.beyondclouds.modules.post.exception.PostServiceException;
 import cn.meteor.beyondclouds.modules.post.mapper.PostMapper;
 import cn.meteor.beyondclouds.modules.post.mapper.PostMapper;
 import cn.meteor.beyondclouds.modules.post.service.IPostService;
 import cn.meteor.beyondclouds.modules.post.service.IPostService;
 import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException;
 import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException;
+import cn.meteor.beyondclouds.modules.user.entity.User;
+import cn.meteor.beyondclouds.modules.user.service.IUserService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -23,6 +27,12 @@ import org.springframework.stereotype.Service;
 @Service
 @Service
 public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IPostService {
 public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IPostService {
 
 
+    private IUserService userService;
+
+    @Autowired
+    public void setUserService(IUserService userService) {
+        this.userService = userService;
+    }
 
 
     /**
     /**
      * 发布动态
      * 发布动态
@@ -52,6 +62,10 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
 
 
         post.setType(type);
         post.setType(type);
 
 
+        //获取用户头像和昵称
+            User user = userService.getById(post.getUserId());
+            post.setUserNick(user.getNickName());
+            post.setUserAvatar(user.getUserAvatar());
         //2.保存动态
         //2.保存动态
         save(post);
         save(post);
 
 
@@ -89,6 +103,8 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements IP
     @Override
     @Override
     public IPage<Post> getPostPage(Integer pageNumber, Integer pageSize) {
     public IPage<Post> getPostPage(Integer pageNumber, Integer pageSize) {
         IPage<Post> postPage = new Page<>(pageNumber,pageSize);
         IPage<Post> postPage = new Page<>(pageNumber,pageSize);
+        QueryWrapper<Post> queryWrapper = new QueryWrapper();
+        queryWrapper.orderByDesc("create_time");
         return page(postPage);
         return page(postPage);
     }
     }
 
 

src/main/java/cn/meteor/beyondclouds/modules/post/vo/PostVO.java

@@ -24,6 +24,10 @@ public class PostVO {
 
 
     private String video;
     private String video;
 
 
+    private String userAvatar;
+
+    private String userNick;
+
     private Date createTime;
     private Date createTime;
 
 
     private Date updateTime;
     private Date updateTime;