From bd65e4e37372a040520ceefc1374937d11a27245 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <773861846@qq.com>
Date: Mon, 11 Nov 2019 14:31:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A6=96=E9=A1=B5=E6=8E=A8?=
 =?UTF-8?q?=E8=8D=90=E5=B0=8F=E8=AF=B4=E5=8F=AF=E9=85=8D=E7=BD=AE=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +--
 .../books/constant/CacheKeyConstans.java      |  1 +
 .../books/mapper/BookIndexMapper.java         |  4 +++
 .../zinglizingli/books/mapper/BookMapper.java |  6 ++++
 .../books/service/BookService.java            | 12 +++++--
 .../books/web/ApiBookController.java          |  2 +-
 .../books/web/BookController.java             | 32 +++++++++---------
 .../books/web/UserController.java             | 11 +------
 .../cache/CommonCacheUtil.java                |  2 +-
 .../cache/impl/EHCacheUtil.java               |  4 +--
 .../config/ErrorConfig.java                   |  2 +-
 .../config/FilterConfig.java                  |  5 ++-
 .../common/config/IndexRecBooksConfig.java    | 33 +++++++++++++++++++
 .../filter/SearchFilter.java                  |  9 +++--
 .../schedule/CrawlBooksSchedule.java          |  4 +--
 .../schedule/SendEmaillSchedule.java          | 20 ++---------
 .../schedule/SendUrlSchedule.java             | 10 ++----
 .../schedule/SendWeiboSchedule.java           |  8 ++---
 .../utils/ContentFactory.java                 |  2 +-
 .../{search => common}/utils/NumberUtil.java  |  2 +-
 .../utils/RestTemplateUtil.java               |  2 +-
 .../{search => common}/utils/SpringUtil.java  |  2 +-
 .../web/IndexController.java                  |  6 +---
 src/main/resources/application.yml            | 13 ++++++++
 .../mybatis/mapping/BookIndexMapper.xml       |  3 ++
 .../resources/mybatis/mapping/BookMapper.xml  | 16 +++++++++
 src/main/resources/templates/books/index.html | 28 ++++------------
 .../SearchApplicationTests.java               |  2 +-
 28 files changed, 139 insertions(+), 106 deletions(-)
 rename src/main/java/xyz/zinglizingli/{search => common}/cache/CommonCacheUtil.java (95%)
 rename src/main/java/xyz/zinglizingli/{search => common}/cache/impl/EHCacheUtil.java (96%)
 rename src/main/java/xyz/zinglizingli/{search => common}/config/ErrorConfig.java (94%)
 rename src/main/java/xyz/zinglizingli/{search => common}/config/FilterConfig.java (74%)
 create mode 100644 src/main/java/xyz/zinglizingli/common/config/IndexRecBooksConfig.java
 rename src/main/java/xyz/zinglizingli/{search => common}/filter/SearchFilter.java (99%)
 rename src/main/java/xyz/zinglizingli/{search => common}/schedule/CrawlBooksSchedule.java (99%)
 rename src/main/java/xyz/zinglizingli/{search => common}/schedule/SendEmaillSchedule.java (73%)
 rename src/main/java/xyz/zinglizingli/{search => common}/schedule/SendUrlSchedule.java (92%)
 rename src/main/java/xyz/zinglizingli/{search => common}/schedule/SendWeiboSchedule.java (99%)
 rename src/main/java/xyz/zinglizingli/{search => common}/utils/ContentFactory.java (99%)
 rename src/main/java/xyz/zinglizingli/{search => common}/utils/NumberUtil.java (98%)
 rename src/main/java/xyz/zinglizingli/{search => common}/utils/RestTemplateUtil.java (96%)
 rename src/main/java/xyz/zinglizingli/{search => common}/utils/SpringUtil.java (97%)
 rename src/main/java/xyz/zinglizingli/{search => common}/web/IndexController.java (65%)
 rename src/test/java/xyz/zinglizingli/{search => common}/SearchApplicationTests.java (90%)

diff --git a/pom.xml b/pom.xml
index 84807cd..9c1b244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>xyz.zinglizingli</groupId>
-    <artifactId>search</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>fiction_hourse</artifactId>
+    <version>1.1</version>
     <name>search</name>
     <description>小说精品楼</description>
 
diff --git a/src/main/java/xyz/zinglizingli/books/constant/CacheKeyConstans.java b/src/main/java/xyz/zinglizingli/books/constant/CacheKeyConstans.java
index e056561..898daf7 100644
--- a/src/main/java/xyz/zinglizingli/books/constant/CacheKeyConstans.java
+++ b/src/main/java/xyz/zinglizingli/books/constant/CacheKeyConstans.java
@@ -6,4 +6,5 @@ public class CacheKeyConstans {
     public static final String BOOK_CONTENT_KEY_PREFIX = "bookContentKeyPrefix";
     public static final String EMAIL_URL_PREFIX_KEY = "emailUrlPrefixKey";
     public static final String RANDOM_NEWS_CONTENT_KEY = "randomNewsContentKey";
+    public static final String REC_BOOK_LIST_KEY = "recBookListKey";
 }
diff --git a/src/main/java/xyz/zinglizingli/books/mapper/BookIndexMapper.java b/src/main/java/xyz/zinglizingli/books/mapper/BookIndexMapper.java
index 46106f1..ac52e37 100644
--- a/src/main/java/xyz/zinglizingli/books/mapper/BookIndexMapper.java
+++ b/src/main/java/xyz/zinglizingli/books/mapper/BookIndexMapper.java
@@ -1,10 +1,12 @@
 package xyz.zinglizingli.books.mapper;
 
 import org.apache.ibatis.annotations.Param;
+import xyz.zinglizingli.books.po.Book;
 import xyz.zinglizingli.books.po.BookIndex;
 import xyz.zinglizingli.books.po.BookIndexExample;
 
 import java.util.List;
+import java.util.Map;
 
 public interface BookIndexMapper {
     int countByExample(BookIndexExample example);
@@ -32,4 +34,6 @@ public interface BookIndexMapper {
     void insertBatch(List<BookIndex> bookIndex);
 
     String queryNewstIndexName(@Param("bookId") Long bookId);
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/xyz/zinglizingli/books/mapper/BookMapper.java b/src/main/java/xyz/zinglizingli/books/mapper/BookMapper.java
index 3466a17..142ee95 100644
--- a/src/main/java/xyz/zinglizingli/books/mapper/BookMapper.java
+++ b/src/main/java/xyz/zinglizingli/books/mapper/BookMapper.java
@@ -5,6 +5,7 @@ import xyz.zinglizingli.books.po.Book;
 import xyz.zinglizingli.books.po.BookExample;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 public interface BookMapper {
@@ -41,4 +42,9 @@ public interface BookMapper {
     List<String> queryNewstBookIdList();
 
     List<String> queryEndBookIdList();
+
+    /**
+     * 查询推荐书籍数据
+     * */
+    List<Book> queryRecBooks(List<Map<String, String>> configMap);
 }
\ No newline at end of file
diff --git a/src/main/java/xyz/zinglizingli/books/service/BookService.java b/src/main/java/xyz/zinglizingli/books/service/BookService.java
index a144ed7..235b55f 100644
--- a/src/main/java/xyz/zinglizingli/books/service/BookService.java
+++ b/src/main/java/xyz/zinglizingli/books/service/BookService.java
@@ -22,9 +22,8 @@ import xyz.zinglizingli.books.mapper.BookIndexMapper;
 import xyz.zinglizingli.books.mapper.BookMapper;
 import xyz.zinglizingli.books.mapper.ScreenBulletMapper;
 import xyz.zinglizingli.books.po.*;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
-import xyz.zinglizingli.search.schedule.SendUrlSchedule;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.utils.RestTemplateUtil;
 
 import java.io.IOException;
 import java.util.*;
@@ -600,4 +599,11 @@ public class BookService {
         return result;
 
     }
+
+    /**
+     * 查询推荐书籍数据
+     * */
+    public List<Book> queryRecBooks(List<Map<String, String>> configMap) {
+        return bookMapper.queryRecBooks(configMap);
+    }
 }
diff --git a/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java b/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java
index 17376d2..e643dce 100644
--- a/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java
+++ b/src/main/java/xyz/zinglizingli/books/web/ApiBookController.java
@@ -11,7 +11,7 @@ import xyz.zinglizingli.books.po.BookContent;
 import xyz.zinglizingli.books.po.BookIndex;
 import xyz.zinglizingli.books.service.BookService;
 import xyz.zinglizingli.books.vo.BookVO;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/xyz/zinglizingli/books/web/BookController.java b/src/main/java/xyz/zinglizingli/books/web/BookController.java
index 60282ab..7117dfb 100644
--- a/src/main/java/xyz/zinglizingli/books/web/BookController.java
+++ b/src/main/java/xyz/zinglizingli/books/web/BookController.java
@@ -1,24 +1,18 @@
 package xyz.zinglizingli.books.web;
 
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.client.RestTemplate;
 import xyz.zinglizingli.books.constant.CacheKeyConstans;
 import xyz.zinglizingli.books.po.Book;
 import xyz.zinglizingli.books.po.BookContent;
@@ -26,20 +20,15 @@ import xyz.zinglizingli.books.po.BookIndex;
 import xyz.zinglizingli.books.po.ScreenBullet;
 import xyz.zinglizingli.books.service.BookService;
 import xyz.zinglizingli.books.vo.BookVO;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.config.IndexRecBooksConfig;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 @Controller
 @RequestMapping("book")
@@ -52,12 +41,26 @@ public class BookController {
     @Autowired
     private CommonCacheUtil commonCacheUtil;
 
+    @Autowired
+    private IndexRecBooksConfig indexRecBooksConfig;
+
 
     private Logger log = LoggerFactory.getLogger(BookController.class);
 
 
     @RequestMapping("index.html")
     public String index(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();
+            //查询推荐书籍数据
+            recBooks = bookService.queryRecBooks(configMap);
+            commonCacheUtil.setObject(CacheKeyConstans.REC_BOOK_LIST_KEY, recBooks, 60 * 60 * 24 * 10);
+            indexRecBooksConfig.setRead(true);
+        }
+
+
         List<Book> hotBooks = (List<Book>) commonCacheUtil.getObject(CacheKeyConstans.HOT_BOOK_LIST_KEY);
         if (hotBooks == null) {
             //查询热点数据
@@ -70,6 +73,7 @@ public class BookController {
             newBooks = bookService.search(1, 20, null, null, null, null, null, null, null, "update_time", "DESC");
             commonCacheUtil.setObject(CacheKeyConstans.NEWST_BOOK_LIST_KEY, newBooks, 60 * 30);
         }
+        modelMap.put("recBooks", recBooks);
         modelMap.put("hotBooks", hotBooks);
         modelMap.put("newBooks", newBooks);
         return "books/index";
@@ -341,6 +345,4 @@ public class BookController {
     }
 
 
-
-
 }
\ No newline at end of file
diff --git a/src/main/java/xyz/zinglizingli/books/web/UserController.java b/src/main/java/xyz/zinglizingli/books/web/UserController.java
index b37177f..48eba05 100644
--- a/src/main/java/xyz/zinglizingli/books/web/UserController.java
+++ b/src/main/java/xyz/zinglizingli/books/web/UserController.java
@@ -1,27 +1,18 @@
 package xyz.zinglizingli.books.web;
 
 
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import xyz.zinglizingli.books.po.Book;
-import xyz.zinglizingli.books.po.BookContent;
-import xyz.zinglizingli.books.po.BookIndex;
 import xyz.zinglizingli.books.po.User;
 import xyz.zinglizingli.books.service.BookService;
 import xyz.zinglizingli.books.service.UserService;
 import xyz.zinglizingli.books.util.UUIDUtils;
-import xyz.zinglizingli.books.vo.BookVO;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 @Controller
diff --git a/src/main/java/xyz/zinglizingli/search/cache/CommonCacheUtil.java b/src/main/java/xyz/zinglizingli/common/cache/CommonCacheUtil.java
similarity index 95%
rename from src/main/java/xyz/zinglizingli/search/cache/CommonCacheUtil.java
rename to src/main/java/xyz/zinglizingli/common/cache/CommonCacheUtil.java
index 9c712e9..6ec4fa4 100644
--- a/src/main/java/xyz/zinglizingli/search/cache/CommonCacheUtil.java
+++ b/src/main/java/xyz/zinglizingli/common/cache/CommonCacheUtil.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.cache;
+package xyz.zinglizingli.common.cache;
 
 public interface CommonCacheUtil {
 
diff --git a/src/main/java/xyz/zinglizingli/search/cache/impl/EHCacheUtil.java b/src/main/java/xyz/zinglizingli/common/cache/impl/EHCacheUtil.java
similarity index 96%
rename from src/main/java/xyz/zinglizingli/search/cache/impl/EHCacheUtil.java
rename to src/main/java/xyz/zinglizingli/common/cache/impl/EHCacheUtil.java
index ae41a61..1b56da1 100644
--- a/src/main/java/xyz/zinglizingli/search/cache/impl/EHCacheUtil.java
+++ b/src/main/java/xyz/zinglizingli/common/cache/impl/EHCacheUtil.java
@@ -1,11 +1,11 @@
-package xyz.zinglizingli.search.cache.impl;
+package xyz.zinglizingli.common.cache.impl;
 
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
 
 @Service
 public class EHCacheUtil implements CommonCacheUtil {
diff --git a/src/main/java/xyz/zinglizingli/search/config/ErrorConfig.java b/src/main/java/xyz/zinglizingli/common/config/ErrorConfig.java
similarity index 94%
rename from src/main/java/xyz/zinglizingli/search/config/ErrorConfig.java
rename to src/main/java/xyz/zinglizingli/common/config/ErrorConfig.java
index 93527f8..a765149 100644
--- a/src/main/java/xyz/zinglizingli/search/config/ErrorConfig.java
+++ b/src/main/java/xyz/zinglizingli/common/config/ErrorConfig.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.config;
+package xyz.zinglizingli.common.config;
 
 import org.springframework.boot.web.server.ErrorPage;
 import org.springframework.boot.web.server.ErrorPageRegistrar;
diff --git a/src/main/java/xyz/zinglizingli/search/config/FilterConfig.java b/src/main/java/xyz/zinglizingli/common/config/FilterConfig.java
similarity index 74%
rename from src/main/java/xyz/zinglizingli/search/config/FilterConfig.java
rename to src/main/java/xyz/zinglizingli/common/config/FilterConfig.java
index e93a7fa..9def961 100644
--- a/src/main/java/xyz/zinglizingli/search/config/FilterConfig.java
+++ b/src/main/java/xyz/zinglizingli/common/config/FilterConfig.java
@@ -1,9 +1,8 @@
-package xyz.zinglizingli.search.config;
+package xyz.zinglizingli.common.config;
 
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import xyz.zinglizingli.search.filter.SearchFilter;
+import xyz.zinglizingli.common.filter.SearchFilter;
 
 @Configuration
 public class FilterConfig{
diff --git a/src/main/java/xyz/zinglizingli/common/config/IndexRecBooksConfig.java b/src/main/java/xyz/zinglizingli/common/config/IndexRecBooksConfig.java
new file mode 100644
index 0000000..33088af
--- /dev/null
+++ b/src/main/java/xyz/zinglizingli/common/config/IndexRecBooksConfig.java
@@ -0,0 +1,33 @@
+package xyz.zinglizingli.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+@Component
+@ConfigurationProperties(prefix = "index")
+public class IndexRecBooksConfig {
+
+
+    private List<Map<String,String>> recBooks;
+
+    private boolean isRead;
+
+    public List<Map<String, String>> getRecBooks() {
+        return recBooks;
+    }
+
+    public void setRecBooks(List<Map<String, String>> recBooks) {
+        this.recBooks = recBooks;
+    }
+
+    public boolean isRead() {
+        return isRead;
+    }
+
+    public void setRead(boolean read) {
+        isRead = read;
+    }
+}
diff --git a/src/main/java/xyz/zinglizingli/search/filter/SearchFilter.java b/src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java
similarity index 99%
rename from src/main/java/xyz/zinglizingli/search/filter/SearchFilter.java
rename to src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java
index 0a418f4..777b307 100644
--- a/src/main/java/xyz/zinglizingli/search/filter/SearchFilter.java
+++ b/src/main/java/xyz/zinglizingli/common/filter/SearchFilter.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.filter;
+package xyz.zinglizingli.common.filter;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -7,11 +7,10 @@ import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RequestCallback;
 import org.springframework.web.client.RestTemplate;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
-import xyz.zinglizingli.search.utils.SpringUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.utils.SpringUtil;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/xyz/zinglizingli/search/schedule/CrawlBooksSchedule.java b/src/main/java/xyz/zinglizingli/common/schedule/CrawlBooksSchedule.java
similarity index 99%
rename from src/main/java/xyz/zinglizingli/search/schedule/CrawlBooksSchedule.java
rename to src/main/java/xyz/zinglizingli/common/schedule/CrawlBooksSchedule.java
index 903ce7f..dadb90f 100644
--- a/src/main/java/xyz/zinglizingli/search/schedule/CrawlBooksSchedule.java
+++ b/src/main/java/xyz/zinglizingli/common/schedule/CrawlBooksSchedule.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.schedule;
+package xyz.zinglizingli.common.schedule;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,7 +13,7 @@ import xyz.zinglizingli.books.po.BookContent;
 import xyz.zinglizingli.books.po.BookIndex;
 import xyz.zinglizingli.books.service.BookService;
 import xyz.zinglizingli.books.util.ExcutorUtils;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.utils.RestTemplateUtil;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/xyz/zinglizingli/search/schedule/SendEmaillSchedule.java b/src/main/java/xyz/zinglizingli/common/schedule/SendEmaillSchedule.java
similarity index 73%
rename from src/main/java/xyz/zinglizingli/search/schedule/SendEmaillSchedule.java
rename to src/main/java/xyz/zinglizingli/common/schedule/SendEmaillSchedule.java
index f656931..bda344f 100644
--- a/src/main/java/xyz/zinglizingli/search/schedule/SendEmaillSchedule.java
+++ b/src/main/java/xyz/zinglizingli/common/schedule/SendEmaillSchedule.java
@@ -1,30 +1,14 @@
-package xyz.zinglizingli.search.schedule;
+package xyz.zinglizingli.common.schedule;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
 import xyz.zinglizingli.books.constant.CacheKeyConstans;
-import xyz.zinglizingli.books.po.Book;
-import xyz.zinglizingli.books.service.BookService;
 import xyz.zinglizingli.books.service.MailService;
 import xyz.zinglizingli.books.util.RandomValueUtil;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
 
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 import java.util.Random;
 
 
diff --git a/src/main/java/xyz/zinglizingli/search/schedule/SendUrlSchedule.java b/src/main/java/xyz/zinglizingli/common/schedule/SendUrlSchedule.java
similarity index 92%
rename from src/main/java/xyz/zinglizingli/search/schedule/SendUrlSchedule.java
rename to src/main/java/xyz/zinglizingli/common/schedule/SendUrlSchedule.java
index 14fbbd8..4ecbe46 100644
--- a/src/main/java/xyz/zinglizingli/search/schedule/SendUrlSchedule.java
+++ b/src/main/java/xyz/zinglizingli/common/schedule/SendUrlSchedule.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.schedule;
+package xyz.zinglizingli.common.schedule;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,15 +13,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
-import xyz.zinglizingli.books.po.Book;
 import xyz.zinglizingli.books.service.BookService;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.utils.RestTemplateUtil;
 
-import java.io.IOException;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 /*
diff --git a/src/main/java/xyz/zinglizingli/search/schedule/SendWeiboSchedule.java b/src/main/java/xyz/zinglizingli/common/schedule/SendWeiboSchedule.java
similarity index 99%
rename from src/main/java/xyz/zinglizingli/search/schedule/SendWeiboSchedule.java
rename to src/main/java/xyz/zinglizingli/common/schedule/SendWeiboSchedule.java
index 43f93b4..69e4c0e 100644
--- a/src/main/java/xyz/zinglizingli/search/schedule/SendWeiboSchedule.java
+++ b/src/main/java/xyz/zinglizingli/common/schedule/SendWeiboSchedule.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.schedule;
+package xyz.zinglizingli.common.schedule;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,14 +12,12 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.util.StringUtils;
 import org.springframework.web.client.RestTemplate;
 import xyz.zinglizingli.books.po.Book;
 import xyz.zinglizingli.books.service.BookService;
-import xyz.zinglizingli.search.cache.CommonCacheUtil;
-import xyz.zinglizingli.search.utils.RestTemplateUtil;
+import xyz.zinglizingli.common.cache.CommonCacheUtil;
+import xyz.zinglizingli.common.utils.RestTemplateUtil;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/xyz/zinglizingli/search/utils/ContentFactory.java b/src/main/java/xyz/zinglizingli/common/utils/ContentFactory.java
similarity index 99%
rename from src/main/java/xyz/zinglizingli/search/utils/ContentFactory.java
rename to src/main/java/xyz/zinglizingli/common/utils/ContentFactory.java
index fef13e9..2288057 100644
--- a/src/main/java/xyz/zinglizingli/search/utils/ContentFactory.java
+++ b/src/main/java/xyz/zinglizingli/common/utils/ContentFactory.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.utils;
+package xyz.zinglizingli.common.utils;
 
 import java.util.*;
 
diff --git a/src/main/java/xyz/zinglizingli/search/utils/NumberUtil.java b/src/main/java/xyz/zinglizingli/common/utils/NumberUtil.java
similarity index 98%
rename from src/main/java/xyz/zinglizingli/search/utils/NumberUtil.java
rename to src/main/java/xyz/zinglizingli/common/utils/NumberUtil.java
index 101ebff..f66bb4f 100644
--- a/src/main/java/xyz/zinglizingli/search/utils/NumberUtil.java
+++ b/src/main/java/xyz/zinglizingli/common/utils/NumberUtil.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.utils;
+package xyz.zinglizingli.common.utils;
 
 
 public class NumberUtil {
diff --git a/src/main/java/xyz/zinglizingli/search/utils/RestTemplateUtil.java b/src/main/java/xyz/zinglizingli/common/utils/RestTemplateUtil.java
similarity index 96%
rename from src/main/java/xyz/zinglizingli/search/utils/RestTemplateUtil.java
rename to src/main/java/xyz/zinglizingli/common/utils/RestTemplateUtil.java
index f6322a6..2dd180b 100644
--- a/src/main/java/xyz/zinglizingli/search/utils/RestTemplateUtil.java
+++ b/src/main/java/xyz/zinglizingli/common/utils/RestTemplateUtil.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.utils;
+package xyz.zinglizingli.common.utils;
 
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
diff --git a/src/main/java/xyz/zinglizingli/search/utils/SpringUtil.java b/src/main/java/xyz/zinglizingli/common/utils/SpringUtil.java
similarity index 97%
rename from src/main/java/xyz/zinglizingli/search/utils/SpringUtil.java
rename to src/main/java/xyz/zinglizingli/common/utils/SpringUtil.java
index d2baf8c..53d452f 100644
--- a/src/main/java/xyz/zinglizingli/search/utils/SpringUtil.java
+++ b/src/main/java/xyz/zinglizingli/common/utils/SpringUtil.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search.utils;
+package xyz.zinglizingli.common.utils;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.beans.BeansException;
diff --git a/src/main/java/xyz/zinglizingli/search/web/IndexController.java b/src/main/java/xyz/zinglizingli/common/web/IndexController.java
similarity index 65%
rename from src/main/java/xyz/zinglizingli/search/web/IndexController.java
rename to src/main/java/xyz/zinglizingli/common/web/IndexController.java
index 0f47763..571fe24 100644
--- a/src/main/java/xyz/zinglizingli/search/web/IndexController.java
+++ b/src/main/java/xyz/zinglizingli/common/web/IndexController.java
@@ -1,12 +1,8 @@
-package xyz.zinglizingli.search.web;
+package xyz.zinglizingli.common.web;
 
 
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.RequestMapping;
-import xyz.zinglizingli.search.utils.ContentFactory;
-
-import java.util.Set;
 
 @Controller
 @RequestMapping
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ec8ac0b..ace8aa8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -53,6 +53,19 @@ mybatis:
   type-aliases-package: xyz.zinglizingli.books.po
 
 
+#首页本站推荐小说配置
+index:
+  recBooks:
+    - {bookName: 黎明之剑,bookAuthor: 远瞳}
+    - {bookName: 诸天投影,bookAuthor: 裴屠狗}
+    - {bookName: 我有一座恐怖屋,bookAuthor: 我会修空调}
+
+
+
+
+
+
+
 
 search:
   schedule:
diff --git a/src/main/resources/mybatis/mapping/BookIndexMapper.xml b/src/main/resources/mybatis/mapping/BookIndexMapper.xml
index ce34606..5400ea4 100644
--- a/src/main/resources/mybatis/mapping/BookIndexMapper.xml
+++ b/src/main/resources/mybatis/mapping/BookIndexMapper.xml
@@ -217,4 +217,7 @@
 
         select index_name from book_index where book_id = #{bookId,jdbcType=BIGINT} order by index_num desc limit 1
     </select>
+
+
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapping/BookMapper.xml b/src/main/resources/mybatis/mapping/BookMapper.xml
index 9b39724..96bfc39 100644
--- a/src/main/resources/mybatis/mapping/BookMapper.xml
+++ b/src/main/resources/mybatis/mapping/BookMapper.xml
@@ -371,4 +371,20 @@
     <select id="queryEndBookIdList" resultType="string">
         select id from book/* where book_status like '%完成%'*/
     </select>
+
+
+    <select id="queryRecBooks" parameterType="java.util.List" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from book
+        <where>
+            <foreach collection="list" item="item" index="index"
+                     separator="or">
+                <trim prefix="(" suffix=")">
+                    book_name = #{item.bookName,jdbcType=VARCHAR} and
+                    author = #{item.bookAuthor,jdbcType=VARCHAR}
+                </trim>
+            </foreach>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/books/index.html b/src/main/resources/templates/books/index.html
index 610175c..8ae3e72 100644
--- a/src/main/resources/templates/books/index.html
+++ b/src/main/resources/templates/books/index.html
@@ -120,30 +120,17 @@
             <div class="layui-container" style="padding: 0px">
 
                 <div class="layui-row" style="text-align: center">
-                    <a href="/book/466.html">
+                    <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%;"
-                                 src="https://www.biquta.com//BookFiles/BookImages/106708.jpg"/>
+                                 th:src="${recBook.picUrl}"/>
                             <br/>
-                            黎明之剑
-                        </div>
-                    </a>
-                    <a href="/book/482.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%;"
-                                 src="https://www.biquta.com//BookFiles/BookImages/111346.jpg"/>
-                            <br/>
-                            诸天投影
-                        </div>
-                    </a>
-                    <a href="/book/349.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%;"
-                                 src="https://www.biquta.com//BookFiles/BookImages/122158.jpg"/>
-                            <br/>
-                            我有一座恐怖屋
+                            <span th:text="${recBook.bookName}"></span>
+
                         </div>
                     </a>
+                        </span>
                 </div>
             </div>
         </div>
@@ -260,8 +247,7 @@
         var curProtocol = window.location.protocol.split(':')[0];
         if (curProtocol === 'https') {
             bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
-        }
-        else {
+        } else {
             bp.src = 'http://push.zhanzhang.baidu.com/push.js';
         }
         var s = document.getElementsByTagName("script")[0];
diff --git a/src/test/java/xyz/zinglizingli/search/SearchApplicationTests.java b/src/test/java/xyz/zinglizingli/common/SearchApplicationTests.java
similarity index 90%
rename from src/test/java/xyz/zinglizingli/search/SearchApplicationTests.java
rename to src/test/java/xyz/zinglizingli/common/SearchApplicationTests.java
index d856280..415cc6f 100644
--- a/src/test/java/xyz/zinglizingli/search/SearchApplicationTests.java
+++ b/src/test/java/xyz/zinglizingli/common/SearchApplicationTests.java
@@ -1,4 +1,4 @@
-package xyz.zinglizingli.search;
+package xyz.zinglizingli.common;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;