From fb2cf6aa8d7df921ec59a494d8815c291c65eae0 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <773861846@qq.com>
Date: Mon, 18 Nov 2019 11:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=BC=AB=E7=94=BB?=
=?UTF-8?q?=E5=86=85=E5=AE=B9=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
novel-front/novel-front.iml | 99 -------------------
.../books/web/BookController.java | 5 +-
.../common/filter/SearchFilter.java | 19 ++++
.../src/main/resources/application.yml | 4 +-
.../templates/books/book_content.html | 5 +-
5 files changed, 28 insertions(+), 104 deletions(-)
diff --git a/novel-front/novel-front.iml b/novel-front/novel-front.iml
index 7182748..eb5b6e4 100644
--- a/novel-front/novel-front.iml
+++ b/novel-front/novel-front.iml
@@ -5,103 +5,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java b/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java
index 86258ba..393b554 100644
--- a/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java
+++ b/novel-front/src/main/java/xyz/zinglizingli/books/web/BookController.java
@@ -244,8 +244,11 @@ public class BookController {
modelMap.put("preIndexNum", preAndNextIndexNum.get(1));
modelMap.put("bookContent", bookContent);
modelMap.put("indexName", indexName);
- String bookName = bookService.queryBaseInfo(bookId).getBookName();
+ Book basicBook = bookService.queryBaseInfo(bookId);
+ String bookName = basicBook.getBookName();
+ Integer catId = basicBook.getCatid();
modelMap.put("bookName", bookName);
+ modelMap.put("catId", catId);
return "books/book_content";
}
diff --git a/novel-front/src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java b/novel-front/src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java
index 5bc4965..bdcfa72 100644
--- a/novel-front/src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java
+++ b/novel-front/src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java
@@ -180,6 +180,25 @@ public class SearchFilter implements Filter {
forObject=forObject.replaceAll("","");
forObject=forObject.replaceAll("globalNav.js","");
forObject=forObject.replaceAll("TSB.js","");
+ forObject=forObject+"";
forObject=forObject+"