From 2819a3034eb5c5a98ea5ca9a4707e744f49e86ff Mon Sep 17 00:00:00 2001
From: xxy <1179705413@qq.com>
Date: Sun, 29 Dec 2019 10:20:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E6=87=92?=
=?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../books/web/IndexController.java | 9 +++-
.../templates/books/book_search.html | 8 +--
.../resources/templates/books/index_v2.html | 12 +++--
.../templates/books/mh_book_search.html | 6 ++-
.../templates/books/soft_book_search.html | 50 ++++++++++---------
5 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java b/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java
index ae65341..69e88b2 100644
--- a/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java
+++ b/novel-front/src/main/java/xyz/zinglizingli/books/web/IndexController.java
@@ -3,10 +3,12 @@ package xyz.zinglizingli.books.web;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import xyz.zinglizingli.books.core.constant.CacheKeyConstans;
import xyz.zinglizingli.books.po.Book;
import xyz.zinglizingli.books.service.BookService;
@@ -42,7 +44,7 @@ public class IndexController {
@RequestMapping(value = {"/index.html","/","/books","/book","/book/index.html"})
- public String index(ModelMap modelMap){
+ public String index(@RequestParam(value = "noLazy", defaultValue = "0") String noLazy,HttpServletRequest req,ModelMap modelMap){
List<Book> recBooks = (List<Book>) commonCacheUtil.getObject(CacheKeyConstans.REC_BOOK_LIST_KEY);
if (!indexRecBooksConfig.isRead() || recBooks == null) {
List<Map<String,String>> configMap = indexRecBooksConfig.getRecBooks();
@@ -69,7 +71,10 @@ public class IndexController {
modelMap.put("recBooks", recBooks);
modelMap.put("hotBooks", hotBooks);
modelMap.put("newBooks", newBooks);
-
+ ServletContext application = req.getServletContext();
+ if(!"1".equals(application.getAttribute("noLazy"))) {
+ application.setAttribute("noLazy", noLazy);
+ }
return "books/index_"+indexTemplate;
}
}
diff --git a/novel-front/src/main/resources/templates/books/book_search.html b/novel-front/src/main/resources/templates/books/book_search.html
index 8afc1db..c85afcd 100644
--- a/novel-front/src/main/resources/templates/books/book_search.html
+++ b/novel-front/src/main/resources/templates/books/book_search.html
@@ -114,9 +114,11 @@
<div th:each="book : ${books}" class="layui-row" style="margin-bottom:10px;padding:10px;background: #f2f2f2">
<a th:href="'/book/'+ ${book.id} + '.html'+ ${token!=null?'?token='+token:''}">
- <div class="layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2" style="text-align: center">
- <img align="center"
- class="lazyload" th:attr="data-src=${book.picUrl}"/>
+ <div class="layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2" style="text-align: center" th:switch = "${application.noLazy}">
+ <img th:case="'1'" align="center"
+ th:src="${book.picUrl}"/>
+ <img th:case="*" align="center"
+ class="lazyload" th:attr="data-src=${book.picUrl}"/>
</div>
</a>
<div style="padding: 20px" class="layui-col-xs6 layui-col-sm8 layui-col-md8 layui-col-lg8">
diff --git a/novel-front/src/main/resources/templates/books/index_v2.html b/novel-front/src/main/resources/templates/books/index_v2.html
index a4b0dfa..a829248 100644
--- a/novel-front/src/main/resources/templates/books/index_v2.html
+++ b/novel-front/src/main/resources/templates/books/index_v2.html
@@ -162,8 +162,10 @@
<div class="layui-row" style="text-align: center">
<span th:each="recBook : ${recBooks}">
<a th:href="'/book/' + ${recBook.id} + '.html'">
- <div style="padding: 1%" class="layui-col-xs4 layui-col-sm4 layui-col-md4 layui-col-lg4">
- <img style=" width:80%; height:auto; max-width:100%; max-height:100%;"
+ <div style="padding: 1%" class="layui-col-xs4 layui-col-sm4 layui-col-md4 layui-col-lg4" th:switch = "${application.noLazy}">
+ <img th:case="'1'" style=" width:80%; height:auto; max-width:100%; max-height:100%;"
+ th:src="${recBook.picUrl}"/>
+ <img th:case="*" style=" width:80%; height:auto; max-width:100%; max-height:100%;"
class="lazyload" th:attr="data-src=${recBook.picUrl}"/>
<br/>
<span th:text="${recBook.bookName}"></span>
@@ -184,8 +186,10 @@
<div style="margin-bottom: 5px" class="layui-col-xs12 layui-col-sm6 layui-col-md4 layui-col-lg4"
th:each="hotBook : ${hotBooks}">
<a th:href="'/book/' + ${hotBook.id} + '.html'">
- <div class="layui-col-xs5 layui-col-sm4 layui-col-md4 layui-col-lg4">
- <img style=" width:100px; height:125px;"
+ <div class="layui-col-xs5 layui-col-sm4 layui-col-md4 layui-col-lg4" th:switch = "${application.noLazy}" >
+ <img th:case="'1'" style=" width:100px; height:125px;"
+ th:src="${hotBook.picUrl}"/>
+ <img th:case="*" style=" width:100px; height:125px;"
class="lazyload" th:attr="data-src=${hotBook.picUrl}"/>
</div>
<div class="layui-col-xs5 layui-col-sm6 layui-col-md6 layui-col-lg6">
diff --git a/novel-front/src/main/resources/templates/books/mh_book_search.html b/novel-front/src/main/resources/templates/books/mh_book_search.html
index d5eb72a..1ecb8e5 100644
--- a/novel-front/src/main/resources/templates/books/mh_book_search.html
+++ b/novel-front/src/main/resources/templates/books/mh_book_search.html
@@ -124,8 +124,10 @@
<div th:each="book : ${books}" class="layui-row" style="margin-bottom:10px;padding:10px;background: #f2f2f2">
<a th:href="'/book/'+ ${book.id} + '.html'">
- <div class="layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2" style="text-align: center">
- <img align="center"
+ <div class="layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2" style="text-align: center" th:switch = "${application.noLazy}">
+ <img th:case="'1'" align="center"
+ th:attr="data-src=${book.picUrl}"/>
+ <img th:case="*" align="center"
class="lazyload" th:attr="data-src=${book.picUrl}"/>
</div>
</a>
diff --git a/novel-front/src/main/resources/templates/books/soft_book_search.html b/novel-front/src/main/resources/templates/books/soft_book_search.html
index 81037a6..c90765b 100644
--- a/novel-front/src/main/resources/templates/books/soft_book_search.html
+++ b/novel-front/src/main/resources/templates/books/soft_book_search.html
@@ -84,7 +84,7 @@
<input type="hidden" id="bookStatus" th:value="${bookStatus}"/>
<input type="hidden" id="softCat" th:value="${softCat}"/>
-<ul class="layui-nav" lay-filter="" style="padding:0 20px;text-align: center" >
+<ul class="layui-nav" lay-filter="" style="padding:0 20px;text-align: center">
<li id="menunew" class="layui-nav-item"><a href="/book/searchSoftBook.html">最新</a></li>
<li id="menu21" class="layui-nav-item"><a href="/book/searchSoftBook.html?softCat=21">魔幻</a></li>
<li id="menu22" class="layui-nav-item"><a href="/book/searchSoftBook.html?softCat=22">玄幻</a></li>
@@ -96,7 +96,7 @@
<li id="menu28" class="layui-nav-item"><a href="/book/searchSoftBook.html?softCat=28">同人</a></li>
<li id="menu29" class="layui-nav-item"><a href="/book/searchSoftBook.html?softCat=29">悬疑</a></li>
<li id="menu0" class="layui-nav-item"><a href="/book/searchSoftBook.html?softCat=0">动漫</a></li>
- <li id="menucomplete" class="layui-nav-item"><a >完本</a>
+ <li id="menucomplete" class="layui-nav-item"><a>完本</a>
<dl class="layui-nav-child"> <!-- 二级菜单 -->
<dd><a href="/book/searchSoftBook.html?bookStatus=已完成">全部</a></dd>
<dd><a href="/book/searchSoftBook.html?bookStatus=已完成&softCat=21">魔幻</a></dd>
@@ -111,7 +111,7 @@
<dd><a href="/book/searchSoftBook.html?bookStatus=已完成&softCat=0">动漫</a></dd>
</dl>
</li>
- <li id="menuhot" class="layui-nav-item"><a >排行</a>
+ <li id="menuhot" class="layui-nav-item"><a>排行</a>
<dl class="layui-nav-child"> <!-- 二级菜单 -->
<dd><a href="/book/searchSoftBook.html?sortBy=score">全部</a></dd>
<dd><a href="/book/searchSoftBook.html?sortBy=score&softCat=21">魔幻</a></dd>
@@ -148,10 +148,13 @@
<div th:each="book : ${books}" class="layui-row" style="margin-bottom:10px;padding:10px;background: #f2f2f2">
<a th:href="'/book/'+ ${book.id} + '.html'">
- <div class="layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2" style="text-align: center">
- <img align="center"
- class="lazyload" th:attr="data-src=${book.picUrl}"/>
- </div>
+ <div class="layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2" style="text-align: center"
+ th:switch="${application.noLazy}">
+ <img th:case="'1'" align="center"
+ th:attr="data-src=${book.picUrl}"/>
+ <img th:case="*" align="center"
+ class="lazyload" th:attr="data-src=${book.picUrl}"/>
+ </div>
</a>
<div style="padding: 20px" class="layui-col-xs6 layui-col-sm8 layui-col-md8 layui-col-lg8">
<a th:href="'/book/'+ ${book.id} + '.html'">
@@ -214,7 +217,7 @@
//首次不执行
if (!first) {
- searchByAllCondition(obj.curr,obj.limit);
+ searchByAllCondition(obj.curr, obj.limit);
} else {
}
@@ -222,20 +225,20 @@
});
});
- function searchByAllCondition(curr,limit,newKeyword){
+ function searchByAllCondition(curr, limit, newKeyword) {
var toUrl = "/book/searchSoftBook.html?curr=" + curr + "&limit=" + limit;
var ids = $("#ids").val();
- if(ids){
+ if (ids) {
toUrl += ("&historyBookIds=" + ids);
}
var keyword = $("#keyword").val();
- if(newKeyword){
+ if (newKeyword) {
toUrl += encodeURI("&keyword=" + newKeyword);
- }else if (keyword) {
+ } else if (keyword) {
toUrl += encodeURI("&keyword=" + keyword);
}
var bookStatus = $("#bookStatus").val();
- if(bookStatus){
+ if (bookStatus) {
toUrl += ("&bookStatus=" + bookStatus);
}
var softCat = $("#softCat").val();
@@ -263,12 +266,12 @@
function searchBooks() {
var keywords = $("#title").val();
$("#keyword").val("");
- searchByAllCondition(1,20,keywords);
+ searchByAllCondition(1, 20, keywords);
}
</script>
<script>
- (function(){
+ (function () {
var bp = document.createElement('script');
var curProtocol = window.location.protocol.split(':')[0];
if (curProtocol === 'https') {
@@ -283,29 +286,28 @@
var sortCat = $("#softCat").val();
var sortBy = $("#sortBy").val();
- if(sortBy == 'score'){
+ if (sortBy == 'score') {
$("#menuhot").addClass("layui-this");
- }else if($("#bookStatus").val()){
+ } else if ($("#bookStatus").val()) {
$("#menucomplete").addClass("layui-this");
- }else if(sortCat){
- $("#menu"+sortCat).addClass("layui-this");
- }else{
+ } else if (sortCat) {
+ $("#menu" + sortCat).addClass("layui-this");
+ } else {
$("#menunew").addClass("layui-this");
}
})();
- function toMyCollect(){
+ function toMyCollect() {
var token = localStorage.getItem("token");
- if(token) {
+ if (token) {
window.location.href = "/book/search?token=" + token;
- }else{
+ } else {
window.location.href = "/user/login.html";
}
}
</script>
-
</html>
\ No newline at end of file