Merge branch 'master' into dev

# Conflicts:
#	src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
#	src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
#	src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
#	src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java

src/main/java/com/rymcu/vertical/dto/ArticleDTO.java

@@ -41,10 +41,14 @@ public class ArticleDTO {
     private String articlePermalink;
     /** 站内链接 */
     private String articleLink;
+    /** 文章状态 */
+    private String articleStatus;
     /** 更新时间 */
     private Date updatedTime;
 
     private Author articleAuthor;
 
     private List<ArticleTagDTO> tags;
+
+    private List<CommentDTO> articleComments;
 }

src/main/java/com/rymcu/vertical/dto/ArticleTagDTO.java

@@ -7,8 +7,13 @@ import lombok.Data;
  */
 @Data
 public class ArticleTagDTO {
+
+    private Integer idArticleTag;
+
     private Integer idTag;
 
+    private Integer idArticle;
+
     private String tagTitle;
 
     private String tagUri;

src/main/java/com/rymcu/vertical/dto/Author.java

@@ -2,6 +2,9 @@ package com.rymcu.vertical.dto;
 
 import lombok.Data;
 
+/**
+ * @author ronger
+ */
 @Data
 public class Author {
 

src/main/java/com/rymcu/vertical/dto/CommentDTO.java

@@ -0,0 +1,41 @@
+package com.rymcu.vertical.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author ronger
+ */
+@Data
+public class CommentDTO {
+    private Integer idComment;
+    /** 评论内容 */
+    private String commentContent;
+    /** 作者 id */
+    private Integer commentAuthorId;
+    /** 文章 id */
+    private Integer commentArticleId;
+    /** 锚点 url */
+    private String commentSharpUrl;
+    /** 父评论 id */
+    private Integer commentOriginalCommentId;
+    /** 父评论作者头像 */
+    private String commentOriginalAuthorThumbnailURL;
+    /** 父评论作者昵称 */
+    private String commentOriginalAuthorNickname;
+    /** 状态 */
+    private String commentStatus;
+    /** 0：公开回帖，1：匿名回帖 */
+    private String commentAnonymous;
+    /** 回帖计数 */
+    private Integer commentReplyCount;
+    /** 0：所有人可见，1：仅楼主和自己可见 */
+    private String commentVisible;
+    /** 创建时间 */
+    private Date createdTime;
+
+    private Author commenter;
+
+    private String timeAgo;
+}

src/main/java/com/rymcu/vertical/dto/LabelModel.java

@@ -0,0 +1,17 @@
+package com.rymcu.vertical.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author ronger
+ */
+@Data
+public class LabelModel implements Serializable {
+
+    private String label;
+
+    private String value;
+
+}

src/main/java/com/rymcu/vertical/dto/UserDTO.java

@@ -2,6 +2,9 @@ package com.rymcu.vertical.dto;
 
 import lombok.Data;
 
+/**
+ * @author ronger
+ */
 @Data
 public class UserDTO {
 
@@ -14,4 +17,6 @@ public class UserDTO {
     private String avatarUrl;
 
     private String nickname;
+
+    private String signature;
 }

src/main/java/com/rymcu/vertical/dto/UserRegisterInfoDTO.java

@@ -0,0 +1,17 @@
+package com.rymcu.vertical.dto;
+
+import lombok.Data;
+
+/**
+ * @author ronger
+ */
+@Data
+public class UserRegisterInfoDTO {
+
+    private String email;
+
+    private String password;
+
+    private String code;
+
+}