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 @@