From 18f5fbf5089a42fce665a357cec329c0b2cba539 Mon Sep 17 00:00:00 2001 From: xiongxiaoyang <1179705413@qq.com> Date: Sat, 13 May 2023 23:40:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=88=91?= =?UTF-8?q?=E7=9A=84=E4=B9=A6=E6=9E=B6=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../novel/controller/PageController.java | 8 + .../com/java2nb/novel/vo/BookShelfVO.java | 13 +- .../mybatis/mapping/UserBookshelfMapper.xml | 3 +- .../templates/mobile/user/favorites.html | 268 ++++++++++++++++++ .../templates/mobile/user/login.html | 2 +- .../templates/mobile/user/register.html | 2 +- .../templates/mobile/user/userinfo.html | 2 +- 7 files changed, 293 insertions(+), 5 deletions(-) create mode 100644 novel-front/src/main/resources/templates/mobile/user/favorites.html diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java b/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java index 43905cc..48c0587 100644 --- a/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java +++ b/novel-front/src/main/java/com/java2nb/novel/controller/PageController.java @@ -115,6 +115,14 @@ public class PageController extends BaseController { return ThreadLocalUtil.getTemplateDir() + "user/userinfo"; } + /** + * 我的书架页 + */ + @RequestMapping("user/favorites.html") + public String favorites() { + return ThreadLocalUtil.getTemplateDir() + "user/favorites"; + } + /** * 作品页 */ diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java index 7573c0c..66faf6c 100644 --- a/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java +++ b/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() { diff --git a/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml b/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml index 7870905..ad80d7d 100644 --- a/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml +++ b/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml @@ -4,7 +4,8 @@ + + + + + + + + + + +
+ +
+ + +
+ 我的书架 +
+ + +
+
+
+
+ + +
+ + +
+ +
+
+
+ + + + +
+ + + + + + \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/mobile/user/login.html b/novel-front/src/main/resources/templates/mobile/user/login.html index 075356f..5622acb 100644 --- a/novel-front/src/main/resources/templates/mobile/user/login.html +++ b/novel-front/src/main/resources/templates/mobile/user/login.html @@ -62,7 +62,7 @@