Merge remote-tracking branch 'Gitee/4.1.x' into develop_xxy

novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java

@@ -92,6 +92,47 @@ public class PageController extends BaseController {
         return ThreadLocalUtil.getTemplateDir() + "index";
     }
 
+    /**
+     * 登录页
+     */
+    @RequestMapping("user/login.html")
+    public String login() {
+        return ThreadLocalUtil.getTemplateDir() + "user/login";
+    }
+
+    /**
+     * 注册页
+     */
+    @RequestMapping("user/register.html")
+    public String register() {
+        return ThreadLocalUtil.getTemplateDir() + "user/register";
+    }
+
+    /**
+     * 用户中心页
+     */
+    @RequestMapping("user/userinfo.html")
+    public String userinfo() {
+        return ThreadLocalUtil.getTemplateDir() + "user/userinfo";
+    }
+
+    /**
+     * 我的书架页
+     */
+    @RequestMapping("user/favorites.html")
+    public String favorites() {
+        return ThreadLocalUtil.getTemplateDir() + "user/favorites";
+    }
+
+    /**
+     * 充值页
+     */
+    @RequestMapping("pay/index.html")
+    public String pay() {
+        return ThreadLocalUtil.getTemplateDir() + "pay/index.html";
+    }
+
+
     /**
      * 作品页
      */

novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.java2nb.novel.entity.UserBookshelf;
 import lombok.Data;
 
+import javax.annotation.Generated;
 import java.util.Date;
 
 /**
@@ -19,9 +20,19 @@ public class BookShelfVO extends UserBookshelf {
     private String lastIndexName;
     private String bookName;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "MM/dd HH:mm:ss")
+
+    private String picUrl;
+
+    private Long authorId;
+
+    private String authorName;
+
+    private String bookDesc;
+
     private Date lastIndexUpdateTime;
 
+    private Byte bookStatus;
+
 
     @Override
     public String toString() {