文档更新

v2.1.2发布
修复网路图片保存时文件损坏的情况
2025-07-01 07:16:39 +00:00 · 2020-05-25 10:59:24 +08:00 · 2020-05-25 10:51:22 +08:00 · 2020-05-25 10:40:50 +08:00 · 2020-05-24 17:59:03 +08:00 · 2020-05-24 09:17:49 +08:00
55 changed files with 1254 additions and 1425 deletions
--- a/.gitignore
+++ b/.gitignore
@ -13,3 +13,6 @@
 /novel-admin/target
 /*.iml
 /novel-admin/*.iml
+.DS_Store
+/novel-admin/cachedata
+/novel-admin/logs
--- a/README.md
+++ b/README.md
@ -40,53 +40,85 @@ novel-plus -- 父工程
 ```

 #### 技术选型
-Springboot+Mybatis+Mysql+Ehcache+Thymeleaf+Layui
+Springboot+Mybatis+Mysql+ElasticSearch+Ehcache+Thymeleaf+Layui

 #### PC站截图

+1. 首页

+![img](https://oscimg.oschina.net/oscnet/up-bbb1c7f72e183327bff754a9fa8bb75223e.png)

-![index](./assets/1588548668698.gif)
+2. 分类索引页

+![img](https://oscimg.oschina.net/oscnet/up-d0b2e03129bfae47b8bb96a491b73d383c5.png)

+3. 搜索页

-![index](./assets/1588548784395.gif)
+![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ20200520-215756.png)

+![img](https://oscimg.oschina.net/oscnet/up-ed5f689557718924acac76bc3ebca36afcb.png)

+4. 排行榜

-![index](./assets/1588548916980.gif)
+![img](https://oscimg.oschina.net/oscnet/up-78d5a68586cd92a86c669311f414508f922.png)

+5. 详情页

+![img](https://oscimg.oschina.net/oscnet/up-8be2495a2869f93626b0c9c1df6f329747a.png)
+
+6. 阅读页
+
+![img](https://oscimg.oschina.net/oscnet/up-517c84148d2db8e11717a8bbecc57fa1be7.png)
+
+7. 用户中心
+
+![img](https://oscimg.oschina.net/oscnet/up-805a30e7a663a3fd5cb39a7ea26bc132a01.png)
+
+8. 充值
+
+![img](https://oscimg.oschina.net/oscnet/up-5a601b0b3af3224d0bebcfe12fc15075d34.png)
+
+![img](https://oscimg.oschina.net/oscnet/up-face25d02c07b05b2ce954cc4bf4ee6a0cc.png)
+
+9. 作家专区
+
+![img](https://oscimg.oschina.net/oscnet/up-30766372cc7f56480ff1d7d55198204f6ea.png)
+
+![img](https://oscimg.oschina.net/oscnet/up-9737995e465b86f3bee3211221f6c3b8a56.png)
+
+10. 购买
+
+![img](https://oscimg.oschina.net/oscnet/up-ce0f585efd82a9670335f118cf5897c85e9.png)
+
+![img](https://oscimg.oschina.net/oscnet/up-f849960f4c1303fea77d26e64fc505a7180.png)

 #### 手机站截图

 1. 首页

-   ![index](./assets/QQ%E5%9B%BE%E7%89%8720191018162208.jpg)
-
-   
+   ![index](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ%E5%9B%BE%E7%89%8720191018162208.jpg)

 2. 小说详情页

-   ![微信图片_20190904181558](./assets/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190904181558.png)
-
-   
+   ![微信图片_20190904181558](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190904181558.png)

 3. 目录页

-   ![QQ图片20191018161901](./assets/QQ%E5%9B%BE%E7%89%8720191108022250.png)
+   ![QQ图片20191018161901](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ%E5%9B%BE%E7%89%8720191108022250.png)

 4. 小说阅读页

-   ![QQ图片20191018161901](./assets/QQ%E5%9B%BE%E7%89%8720191018161901.png)
-
-   
+   ![QQ图片20191018161901](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ%E5%9B%BE%E7%89%8720191018161901.png)

 #### 爬虫管理系统截图

-![QQ图片20191018161901](./assets/crawl_index.png)
+![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.2/assets/crawl_index.png)

+#### 后台管理系统截图

+![img](https://oscimg.oschina.net/oscnet/up-0552343538674a22a64819834100558f39b.png)
+
+![img](https://oscimg.oschina.net/oscnet/up-faf5dda7320674c29a1772bc0c81d74762e.png)

 #### 安装步骤

@ -127,7 +159,7 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)

 #### QQ交流群

-![mini-code](./assets/qq_group.png)
+![mini-code](./assets/小说精品屋开源项目交流群群聊二维码.png)

 #### 捐赠支持

--- a/assets/QQ20200520-215756.png
+++ b/assets/QQ20200520-215756.png
--- a/assets/crawl_index.png
+++ b/assets/crawl_index.png
--- a/es/index_create.txt
+++ b/es/index_create.txt
@ -0,0 +1,82 @@
+PUT /novel
+{
+  "mappings" : {
+    "book" : {
+      "properties" : {
+        "id" : {
+          "type" : "long"
+        },
+        "authorId" : {
+          "type" : "long"
+        },
+        "authorName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 1.9
+        },
+
+        "bookName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 2
+        },
+
+        "bookDesc" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 0.1
+        },
+
+        "bookStatus" : {
+          "type" : "short"
+        },
+
+        "catId" : {
+          "type" : "integer"
+        },
+
+        "catName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 1.0
+        },
+
+        "lastIndexId" : {
+          "type" : "long"
+        },
+
+        "lastIndexName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 0.1
+        },
+
+        "lastIndexUpdateTime" : {
+          "type": "keyword"
+        },
+
+        "picUrl" : {
+          "type" : "keyword"
+        },
+
+        "score" : {
+          "type" : "float"
+        },
+
+        "wordCount" : {
+          "type" : "integer"
+        },
+
+        "workDirection" : {
+          "type" : "short"
+        },
+
+        "visitCount" : {
+          "type": "long"
+        }
+
+
+      }
+    }
+  }
+}
--- a/novel-admin/logs/debug.log
+++ b/novel-admin/logs/debug.log
@ -3,3 +3,6 @@
 2020-05-13 21:52:01,131 INFO (SpringApplication.java:663)- The following profiles are active: dev
 2020-05-13 21:52:54,469 DEBUG (ApplicationContextRegister.java:29)- ApplicationContext registed-->org.springframework.web.context.support.GenericWebApplicationContext@5b529706: startup date [Wed May 13 21:52:01 CST 2020]; root of context hierarchy
 2020-05-13 21:53:49,622 INFO (StartupInfoLogger.java:59)- Started TestDemo in 114.268 seconds (JVM running for 124.957)
+2020-05-18 09:48:03,219 INFO (StartupInfoLogger.java:50)- Starting TestDemo on DESKTOP-CPCLUI6 with PID 13172 (started by 11797 in D:\gitee\novel-plus\novel-admin)
+2020-05-18 09:48:03,223 DEBUG (StartupInfoLogger.java:53)- Running with Spring Boot v2.0.1.RELEASE, Spring v5.0.5.RELEASE
+2020-05-18 09:48:03,227 INFO (SpringApplication.java:663)- The following profiles are active: dev
--- a/novel-admin/src/main/resources/static/js/plugins/switchery/switchery.js
+++ b/novel-admin/src/main/resources/static/js/plugins/switchery/switchery.js
--- a/novel-common/pom.xml
+++ b/novel-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>novel</artifactId>
        <groupId>com.java2nb</groupId>
-        <version>2.0.0</version>
+        <version>2.1.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/novel-common/src/main/java/com/java2nb/novel/core/cache/CacheKey.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/cache/CacheKey.java
@ -46,4 +46,8 @@ public interface CacheKey {
     * */
    String RUNNING_CRAWL_THREAD_KEY_PREFIX = "runningCrawlTreadDataKeyPrefix";

+    /**
+     * 上一次搜索引擎更新的时间
+     * */
+    String ES_LAST_UPDATE_TIME = "esLastUpdateTime";
 }
--- a/novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java
@ -1,6 +1,7 @@
 package com.java2nb.novel.core.utils;

 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
 import org.apache.http.client.utils.DateUtils;
 import org.springframework.core.io.Resource;
@ -9,6 +10,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;

+import javax.imageio.ImageIO;
 import java.io.*;
 import java.util.Date;
 import java.util.Objects;
@ -17,34 +19,65 @@ import java.util.Objects;
 * 文件操作工具类
 * @author 11797
 */
+@Slf4j
 public class FileUtil {

    /**
     * 网络图片转本地
     * */
-    @SneakyThrows
    public static String network2Local(String picSrc,String picSavePath,String visitPrefix) {
-        //本地图片保存
-        HttpHeaders headers = new HttpHeaders();
-        HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
-        ResponseEntity<Resource> resEntity = RestTemplateUtil.getInstance(Charsets.ISO_8859_1.name()).exchange(picSrc, HttpMethod.GET, requestEntity, Resource.class);
-        InputStream input = Objects.requireNonNull(resEntity.getBody()).getInputStream();
-        Date currentDate = new Date();
-        picSrc = visitPrefix  + DateUtils.formatDate(currentDate, "yyyy") + "/" + DateUtils.formatDate(currentDate, "MM") + "/" + DateUtils.formatDate(currentDate, "dd") + "/"
-                + UUIDUtil.getUUID32()
-                + picSrc.substring(picSrc.lastIndexOf("."));
-        File picFile = new File(picSavePath + picSrc);
-        File parentFile = picFile.getParentFile();
-        if (!parentFile.exists()) {
-            parentFile.mkdirs();
+        InputStream input = null;
+        OutputStream out = null;
+        try {
+            //本地图片保存
+            HttpHeaders headers = new HttpHeaders();
+            HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
+            ResponseEntity<Resource> resEntity = RestTemplateUtil.getInstance(Charsets.ISO_8859_1.name()).exchange(picSrc, HttpMethod.GET, requestEntity, Resource.class);
+            input = Objects.requireNonNull(resEntity.getBody()).getInputStream();
+            Date currentDate = new Date();
+            picSrc = visitPrefix + DateUtils.formatDate(currentDate, "yyyy") + "/" + DateUtils.formatDate(currentDate, "MM") + "/" + DateUtils.formatDate(currentDate, "dd") + "/"
+                    + UUIDUtil.getUUID32()
+                    + picSrc.substring(picSrc.lastIndexOf("."));
+            File picFile = new File(picSavePath + picSrc);
+            File parentFile = picFile.getParentFile();
+            if (!parentFile.exists()) {
+                parentFile.mkdirs();
+            }
+            out = new FileOutputStream(picFile);
+            byte[] b = new byte[4096];
+            for (int n; (n = input.read(b)) != -1; ) {
+                out.write(b, 0, n);
+            }
+
+            out.flush();
+            if( ImageIO.read(picFile) == null){
+                picSrc = "/images/default.gif";
+            }
+
+        }catch (Exception e){
+            log.error(e.getMessage(),e);
+
+            picSrc = "/images/default.gif";
+        }finally {
+            if(input != null){
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    log.error(e.getMessage(),e);
+                }finally {
+                    if(out != null){
+                        try {
+                            out.close();
+                        } catch (IOException e) {
+                            log.error(e.getMessage(),e);
+                        }
+                    }
+                }
+            }
        }
-        OutputStream out = new FileOutputStream(picFile);
-        byte[] b = new byte[4096];
-        for (int n; (n = input.read(b)) != -1; ) {
-            out.write(b, 0, n);
-        }
-        out.close();
-        input.close();
+
+
+
        return picSrc;
    }

--- a/novel-common/src/main/java/com/java2nb/novel/core/utils/RestTemplateUtil.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/utils/RestTemplateUtil.java
@ -57,7 +57,7 @@ public class RestTemplateUtil {
        requestFactory.setHttpClient(httpClient);
        requestFactory.setConnectionRequestTimeout(3000);
        requestFactory.setConnectTimeout(3000);
-        requestFactory.setReadTimeout(10000);
+        requestFactory.setReadTimeout(30000);
        RestTemplate restTemplate = new RestTemplate(requestFactory);
        List<HttpMessageConverter<?>> list = restTemplate.getMessageConverters();
        for (HttpMessageConverter<?> httpMessageConverter : list) {
--- a/novel-common/src/main/java/com/java2nb/novel/core/utils/StringUtil.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/utils/StringUtil.java
@ -0,0 +1,73 @@
+package com.java2nb.novel.core.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+
+/**
+ * @author xiongxiaoyang
+ */
+public class StringUtil {
+
+    /**
+     * 将驼峰式命名的字符串转换为下划线大写方式。如果转换前的驼峰式命名的字符串为空，则返回空字符串。</br>
+     * 例如：HelloWorld->HELLO_WORLD
+     * @param name 转换前的驼峰式命名的字符串
+     * @return 转换后下划线大写方式命名的字符串
+     */
+    public static String underscoreName(String name) {
+        StringBuilder result = new StringBuilder();
+        if (name != null && name.length() > 0) {
+            // 将第一个字符处理成大写
+            result.append(name.substring(0, 1).toUpperCase());
+            // 循环处理其余字符
+            for (int i = 1; i < name.length(); i++) {
+                String s = name.substring(i, i + 1);
+                // 在大写字母前添加下划线
+                if (s.equals(s.toUpperCase()) && !Character.isDigit(s.charAt(0))) {
+                    result.append("_");
+                }
+                // 其他字符直接转成大写
+                result.append(s.toUpperCase());
+            }
+        }
+        return result.toString();
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。</br>
+     * 例如：HELLO_WORLD->HelloWorld
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String camelName(String name) {
+        StringBuilder result = new StringBuilder();
+        // 快速检查
+        if (name == null || name.isEmpty()) {
+            // 没必要转换
+            return "";
+        } else if (!name.contains("_")) {
+            // 不含下划线，仅将首字母小写
+            return name.substring(0, 1).toLowerCase() + name.substring(1);
+        }
+        // 用下划线将原始字符串分割
+        String camels[] = name.split("_");
+        for (String camel : camels) {
+            // 跳过原始字符串中开头、结尾的下换线或双重下划线
+            if (camel.isEmpty()) {
+                continue;
+            }
+            // 处理真正的驼峰片段
+            if (result.length() == 0) {
+                // 第一个驼峰片段，全部字母都小写
+                result.append(camel.toLowerCase());
+            } else {
+                // 其他的驼峰片段，首字母大写
+                result.append(camel.substring(0, 1).toUpperCase());
+                result.append(camel.substring(1).toLowerCase());
+            }
+        }
+        return result.toString();
+    }
+
+}
--- a/novel-common/src/main/resources/application-common-dev.yml
+++ b/novel-common/src/main/resources/application-common-dev.yml
@ -4,7 +4,7 @@ spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
-    password:
+    password: test123456
    driver-class-name: com.mysql.cj.jdbc.Driver


--- a/novel-crawl/pom.xml
+++ b/novel-crawl/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>novel</artifactId>
        <groupId>com.java2nb</groupId>
-        <version>2.0.0</version>
+        <version>2.1.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java
@ -3,12 +3,17 @@ package com.java2nb.novel.core.crawl;
 import com.java2nb.novel.core.utils.HttpUtil;
 import com.java2nb.novel.core.utils.IdWorker;
 import com.java2nb.novel.core.utils.RandomBookInfoUtil;
+import com.java2nb.novel.core.utils.RestTemplateUtil;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
 import com.java2nb.novel.utils.Constants;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;

 import java.text.SimpleDateFormat;
 import java.util.*;
@ -22,17 +27,24 @@ import static java.util.regex.Pattern.compile;
 *
 * @author Administrator
 */
+@Slf4j
 public class CrawlParser {

+    private static IdWorker idWorker = new IdWorker();
+
    public static final Integer BOOK_INDEX_LIST_KEY = 1;

    public static final Integer BOOK_CONTENT_LIST_KEY = 2;

+    private static RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");
+
+    private static ThreadLocal <Integer> retryCount = new ThreadLocal<>();
+
    @SneakyThrows
    public static Book parseBook(RuleBean ruleBean, String bookId) {
        Book book = new Book();
        String bookDetailUrl = ruleBean.getBookDetailUrl().replace("{bookId}", bookId);
-        String bookDetailHtml = HttpUtil.getByHttpClient(bookDetailUrl);
+        String bookDetailHtml = getByHttpClient(bookDetailUrl);
        if (bookDetailHtml != null) {
            Pattern bookNamePatten = compile(ruleBean.getBookNamePatten());
            Matcher bookNameMatch = bookNamePatten.matcher(bookDetailHtml);
@ -54,6 +66,9 @@ public class CrawlParser {
                        boolean isFindPicUrl = picUrlMatch.find();
                        if (isFindPicUrl) {
                            String picUrl = picUrlMatch.group(1);
+                            if(StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
+                                picUrl = ruleBean.getPicUrlPrefix() + picUrl;
+                            }
                            //设置封面图片路径
                            book.setPicUrl(picUrl);
                        }
@ -81,6 +96,8 @@ public class CrawlParser {

                    String desc = bookDetailHtml.substring(bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
                    desc = desc.substring(0, desc.indexOf(ruleBean.getDescEnd()));
+                    //过滤掉简介中的a标签
+                    desc = desc.replaceAll("<a[^<]+</a>","");
                    //设置书籍简介
                    book.setBookDesc(desc);
                    if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@ -136,8 +153,13 @@ public class CrawlParser {
        List<BookContent> contentList = new ArrayList<>();
        //读取目录
        String indexListUrl = ruleBean.getBookIndexUrl().replace("{bookId}", sourceBookId);
-        String indexListHtml = HttpUtil.getByHttpClient(indexListUrl);
+        String indexListHtml = getByHttpClient(indexListUrl);
+
        if (indexListHtml != null) {
+            if(StringUtils.isNotBlank(ruleBean.getBookIndexStart())){
+                indexListHtml = indexListHtml.substring(indexListHtml.indexOf(ruleBean.getBookIndexStart()) + ruleBean.getBookIndexStart().length());
+            }
+
            Pattern indexIdPatten = compile(ruleBean.getIndexIdPatten());
            Matcher indexIdMatch = indexIdPatten.matcher(indexListHtml);

@ -155,6 +177,7 @@ public class CrawlParser {
            String lastIndexName = null;

            while (isFindIndex) {
+
                BookIndex hasIndex = hasIndexs.get(indexNum);
                String indexName = indexNameMatch.group(1);

@ -162,8 +185,8 @@ public class CrawlParser {
                    String contentUrl = ruleBean.getBookContentUrl().replace("{bookId}", sourceBookId).replace("{indexId}", indexIdMatch.group(1));

                    //查询章节内容
-                    String contentHtml = HttpUtil.getByHttpClient(contentUrl);
-                    if (contentHtml != null) {
+                    String contentHtml = getByHttpClient(contentUrl);
+                    if (contentHtml != null && !contentHtml.contains("正在手打中")) {
                        String content = contentHtml.substring(contentHtml.indexOf(ruleBean.getContentStart()) + ruleBean.getContentStart().length());
                        content = content.substring(0, content.indexOf(ruleBean.getContentEnd()));
                        //TODO插入章节目录和章节内容
@ -181,7 +204,7 @@ public class CrawlParser {
                        if(hasIndexs.size() == 0){
                            //新书入库
                            //设置目录和章节内容
-                            Long indexId = new IdWorker().nextId();
+                            Long indexId = idWorker.nextId();
                            lastIndexId = indexId;
                            lastIndexName = indexName;
                            bookIndex.setId(indexId);
@ -237,4 +260,37 @@ public class CrawlParser {
    }


+    private static String getByHttpClient(String url) {
+        try {
+            ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
+            if (forEntity.getStatusCode() == HttpStatus.OK) {
+                String body = forEntity.getBody();
+                if(body.length() < Constants.INVALID_HTML_LENGTH){
+                    return processErrorHttpResult(url);
+                }
+                //成功获得html内容
+                return body;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return processErrorHttpResult(url);
+
+    }
+
+    @SneakyThrows
+    private static String processErrorHttpResult(String url){
+        Integer count = retryCount.get();
+        if(count == null){
+            count = 0;
+        }
+        if(count < Constants.HTTP_FAIL_RETRY_COUNT){
+            Thread.sleep(  new Random().nextInt(10*1000));
+            retryCount.set(++count);
+            return getByHttpClient(url);
+        }
+        return null;
+    }
+
+
 }
--- a/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java
@ -11,6 +11,14 @@ import java.util.Map;
@Data
 public class RuleBean {

+    /**
+     * 小说更新列表url
+     * */
+    private String updateBookListUrl;
+
+    /**
+     * 分类列表页URL规则
+     * */
    private String bookListUrl;

    private Map<String,String> catIdRule;
@ -39,4 +47,9 @@ public class RuleBean {
    private String contentEnd;


+    private String picUrlPrefix;
+
+    private String bookIndexStart;
+
+
 }
--- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java
@ -167,6 +167,11 @@ public class CrawlServiceImpl implements CrawlService {
                        boolean isFindBookId = bookIdMatcher.find();
                        while (isFindBookId) {
                            try {
+                                if(Thread.currentThread().isInterrupted()){
+                                    return;
+                                }
+
+
                                String bookId = bookIdMatcher.group(1);
                                Book book = CrawlParser.parseBook(ruleBean, bookId);
                                //这里只做新书入库，查询是否存在这本书
--- a/novel-crawl/src/main/java/com/java2nb/novel/utils/Constants.java
+++ b/novel-crawl/src/main/java/com/java2nb/novel/utils/Constants.java
@ -14,4 +14,14 @@ public class Constants {
     * 访问量默认值
     */
    public static final Long VISIT_COUNT_DEFAULT = 100L;
+
+    /**
+     * 爬取小说http请求中无效的内容长度
+     */
+    public static final int INVALID_HTML_LENGTH = 1500;
+
+    /**
+     * 爬取小说http请求失败重试次数
+     */
+    public static final Integer HTTP_FAIL_RETRY_COUNT = 5;
 }
--- a/novel-crawl/src/main/resources/templates/crawl/crawlSource_add.html
+++ b/novel-crawl/src/main/resources/templates/crawl/crawlSource_add.html
@ -57,6 +57,9 @@
                                <li><span id="LabErr"></span></li>
                                示例：<b>新顶点小说网</b>
                                <li><input type="text" id="sourceName" class="s_input icon_name" placeholder="源站名"></li>
+                                <!--示例：<b>https://m.xdingdiann.com/sort/0/1.html</b>
+                                <li><input type="text" id="updateBookListUrl" class="s_input icon_key"
+                                           placeholder="小说更新列表url"></li>-->
                                示例：<b>http://m.xdingdiann.com/sort/{catId}/{page}.html</b> ({catId}代表分类ID，{page}代表分页页码)
                                <li><input type="text" id="bookListUrl" class="s_input icon_key"
                                           placeholder="分类列表页URL规则"></li>
@ -95,6 +98,9 @@
                                示例：<b>&lt;img src="([^>]+)"\s+onerror="this.src=</b>
                                <li><input type="text" id="picUrlPatten" class="s_input icon_key"
                                           placeholder="小说图片路径的正则表达式："></li>
+                                <b>可空，适用于图片路径为相对路径的源站，加上小说图片路径，则为完整的可访问的图片路径</b>
+                                <li><input type="text" id="picUrlPrefix" class="s_input icon_key"
+                                           placeholder="小说图片访问路径前缀："></li>
                                示例：<b>状态：([^/]+)&lt;/li&gt;</b>
                                <li><input type="text" id="statusPatten" class="s_input icon_key"
                                           placeholder="小说状态的正则表达式："></li>
@ -125,6 +131,9 @@
                                示例：<b>http://m.xdingdiann.com/ddk{bookId}/all.html</b> (bookId代表小说ID)
                                <li><input type="text" id="bookIndexUrl" class="s_input icon_key"
                                           placeholder="小说目录页的URL规则："></li>
+                                <b>可空，适用于最新章节列表和全部章节列表在同一个页面的源站</b>
+                                <li><input type="text" id="bookIndexStart" class="s_input icon_key"
+                                           placeholder="小说目录页内容开始截取字符串："></li>
                                示例：<b>&lt;a\s+style=""\s+href="/ddk\d+/(\d+)\.html"&gt;[^/]+&lt;/a&gt;</b>
                                <li><input type="text" id="indexIdPatten" class="s_input icon_key"
                                           placeholder="目录页目录ID正则表达式："></li>
@ -278,6 +287,12 @@
            crawlRule.picUrlPatten = picUrlPatten;
        }

+        var picUrlPrefix = $("#picUrlPrefix").val();
+
+        if (picUrlPrefix.length > 0) {
+            crawlRule.picUrlPrefix = picUrlPrefix;
+        }
+
        var statusPatten = $("#statusPatten").val();
        if (statusPatten.length > 0) {
            crawlRule.statusPatten = statusPatten;
@ -345,6 +360,13 @@

        crawlRule.bookIndexUrl = bookIndexUrl;

+
+        var bookIndexStart = $("#bookIndexStart").val();
+
+        if (bookIndexStart.length > 0) {
+            crawlRule.bookIndexStart = bookIndexStart;
+        }
+
        var indexIdPatten = $("#indexIdPatten").val();

        if (indexIdPatten.length == 0) {
--- a/novel-front/pom.xml
+++ b/novel-front/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>novel</artifactId>
        <groupId>com.java2nb</groupId>
-        <version>2.0.0</version>
+        <version>2.1.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -28,6 +28,18 @@
        </dependency>


+        <dependency>
+            <groupId>io.searchbox</groupId>
+            <artifactId>jest</artifactId>
+            <version>${jest.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+
+
        <dependency>
            <groupId>com.alipay.sdk</groupId>
            <artifactId>alipay-sdk-java</artifactId>
--- a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
@ -55,7 +55,7 @@ public class AuthorController extends BaseController{
     * 发布小说
     * */
    @PostMapping("addBook")
-    public ResultBean addBook(Book book,HttpServletRequest request){
+    public ResultBean addBook(@RequestParam("bookDesc") String bookDesc,Book book,HttpServletRequest request){

        //查询作家信息
        Author author = authorService.queryAuthor(getUserDetails(request).getId());
@ -67,6 +67,10 @@ public class AuthorController extends BaseController{

        }

+        //bookDesc不能使用book对象来接收，否则会自动去掉前面的空格
+        book.setBookDesc(bookDesc
+                .replaceAll("\\n","<br>")
+                .replaceAll("\\s","&nbsp;"));
        //发布小说
        bookService.addBook(book,author.getId(),author.getPenName());

@ -109,6 +113,8 @@ public class AuthorController extends BaseController{
            return ResultBean.fail(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
        }

+        content = content.replaceAll("\\n","<br>")
+                .replaceAll("\\s","&nbsp;");
        //发布章节内容
        bookService.addBookContent(bookId,indexName,content,author.getId());

--- a/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
@ -79,8 +79,8 @@ public class BookController extends BaseController{
     * */
    @PostMapping("searchByPage")
    public ResultBean searchByPage(BookSP bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize){
-        List<BookVO> books = bookService.searchByPage(bookSP,page,pageSize);
-        return ResultBean.ok(new PageInfo<>(books));
+        PageInfo<BookVO> pageInfo = bookService.searchByPage(bookSP,page,pageSize);
+        return ResultBean.ok(pageInfo);
    }

    /**
--- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
@ -101,7 +101,9 @@ public class UserController extends BaseController {
            token = jwtTokenUtil.refreshToken(token);
            Map<String, Object> data = new HashMap<>(2);
            data.put("token", token);
-            data.put("username", jwtTokenUtil.getUserDetailsFromToken(token).getUsername());
+            UserDetails userDetail = jwtTokenUtil.getUserDetailsFromToken(token);
+            data.put("username", userDetail.getUsername());
+            data.put("nickName", userDetail.getNickName());
            return ResultBean.ok(data);

        } else {
@ -232,6 +234,12 @@ public class UserController extends BaseController {
            return ResultBean.fail(ResponseStatus.NO_LOGIN);
        }
        userService.updateUserInfo(userDetails.getId(),user);
+        if(user.getNickName() != null){
+            userDetails.setNickName(user.getNickName());
+            Map<String, Object> data = new HashMap<>(1);
+            data.put("token", jwtTokenUtil.generateToken(userDetails));
+            return ResultBean.ok(data);
+        }
        return ResultBean.ok();
    }

--- a/novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/bean/UserDetails.java
@ -11,4 +11,6 @@ public class UserDetails {
    private Long id;

    private String username;
+
+    private String nickName;
 }
--- a/novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java
@ -0,0 +1,96 @@
+package com.java2nb.novel.core.schedule;
+
+import com.java2nb.novel.core.cache.CacheKey;
+import com.java2nb.novel.core.cache.CacheService;
+import com.java2nb.novel.core.utils.BeanUtil;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.vo.EsBookVO;
+import io.searchbox.client.JestClient;
+import io.searchbox.core.DocumentResult;
+import io.searchbox.core.Index;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 小说导入搜索引擎
+ *
+ * @author Administrator
+ */
+@ConditionalOnProperty(prefix = "spring.elasticsearch", name = "enable", havingValue = "1")
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class BookToEsSchedule {
+
+    private final BookService bookService;
+
+    private final CacheService cacheService;
+
+    private final JestClient jestClient;
+
+
+    private boolean lock = false;
+
+    /**
+     * 2分钟导入一次
+     */
+    @Scheduled(fixedRate = 1000 * 60 * 2)
+    public void saveToEs() {
+        if (!lock) {
+            lock = true;
+            try {
+                //查询需要更新的小说
+                Date lastDate = (Date) cacheService.getObject(CacheKey.ES_LAST_UPDATE_TIME);
+                if (lastDate == null) {
+                    lastDate = new SimpleDateFormat("yyyy-MM-dd").parse("2020-01-01");
+                }
+
+                long count ;
+                do {
+
+                    List<Book> books = bookService.queryBookByUpdateTimeByPage(lastDate,100);
+                    for(Book book : books) {
+                        //导入到ES
+                        EsBookVO esBookVO = new EsBookVO();
+                        BeanUtils.copyProperties(book,esBookVO,"lastIndexUpdateTime");
+                        esBookVO.setLastIndexUpdateTime(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(book.getLastIndexUpdateTime()));
+                        Index action = new Index.Builder(esBookVO).index("novel").type("book").id(book.getId().toString()).build();
+
+                        jestClient.execute(action);
+
+                        lastDate = book.getUpdateTime();
+                        //1秒钟导入一本书，1分钟导入60本
+                        Thread.sleep(1000);
+
+                    }
+
+                    count = books.size();
+
+                }while (count == 100);
+
+                cacheService.setObject(CacheKey.ES_LAST_UPDATE_TIME, lastDate);
+
+            } catch (Exception e) {
+                log.error(e.getMessage(),e);
+            }
+
+
+            lock = false;
+        }
+
+
+    }
+
+
+}
--- a/novel-front/src/main/java/com/java2nb/novel/core/schedule/Network2LocalPicSchedule.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/schedule/Network2LocalPicSchedule.java
@ -3,6 +3,7 @@ package com.java2nb.novel.core.schedule;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.service.BookService;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -13,9 +14,10 @@ import java.util.List;

 /**
 * 网络图片转存本地任务
+ *
 * @author Administrator
 */
-@ConditionalOnProperty(prefix = "pic.save",name = "type",havingValue = "2")
+@ConditionalOnProperty(prefix = "pic.save", name = "type", havingValue = "2")
@Service
@RequiredArgsConstructor
@Slf4j
@ -33,20 +35,18 @@ public class Network2LocalPicSchedule {
     * 10分钟转一次
     */
    @Scheduled(fixedRate = 1000 * 60 * 10)
+    @SneakyThrows
    public void trans() {

        log.info("Network2LocalPicSchedule。。。。。。。。。。。。");


-        Integer offset = 0, limit = 100;
-        List<Book> networkPicBooks;
-        do {
-            networkPicBooks = bookService.queryNetworkPicBooks(limit, offset);
-            for (Book book : networkPicBooks) {
-                bookService.updateBookPicToLocal(book.getPicUrl(), book.getId());
-            }
-            offset += limit;
-        } while (networkPicBooks.size() > 0);
+        List<Book> networkPicBooks = bookService.queryNetworkPicBooks(100);
+        for (Book book : networkPicBooks) {
+            bookService.updateBookPicToLocal(book.getPicUrl(), book.getId());
+            //3秒钟转化一张图片，10分钟转化200张
+            Thread.sleep(3000);
+        }


    }
--- a/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
@ -1,37 +1,42 @@
 package com.java2nb.novel.core.wrapper;

+import org.apache.commons.lang3.StringUtils;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
+import java.util.Arrays;
+import java.util.List;

 /**
 * XSS过滤处理
+ *
 * @author Administrator
 */
-public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper
-{
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
+
+    /**
+     * 假如有有html 代码是自己传来的  需要设定对应的name 不过滤
+     */
+    private static final List<String> noFilterNames = Arrays.asList("content");
+
    /**
     * @param request
     */
-    public XssHttpServletRequestWrapper(HttpServletRequest request)
-    {
+    public XssHttpServletRequestWrapper(HttpServletRequest request) {
        super(request);
    }

    @Override
-    public String[] getParameterValues(String name)
-    {
+    public String[] getParameterValues(String name) {
        String[] values = super.getParameterValues(name);
-        if (values != null)
-        {
+        if (!noFilterNames.contains(name) && values != null) {
            int length = values.length;
            String[] escapseValues = new String[length];
-            for (int i = 0; i < length; i++)
-            {
-                // 防xss攻击和过滤前后空格
-                escapseValues[i] = values[i].replaceAll("<","&lt;").replaceAll(">","&gt;");
+            for (int i = 0; i < length; i++) {
+                escapseValues[i] = values[i].replaceAll("<", "&lt;").replaceAll(">", "&gt;");
            }
            return escapseValues;
        }
-        return super.getParameterValues(name);
+        return values;
    }
 }
--- a/novel-front/src/main/java/com/java2nb/novel/mapper/FrontBookMapper.java
+++ b/novel-front/src/main/java/com/java2nb/novel/mapper/FrontBookMapper.java
@ -5,6 +5,7 @@ import com.java2nb.novel.search.BookSP;
 import com.java2nb.novel.vo.BookVO;
 import org.apache.ibatis.annotations.Param;

+import java.util.Date;
 import java.util.List;

 /**
@ -15,13 +16,13 @@ public interface FrontBookMapper extends BookMapper {

    List<BookVO> searchByPage(BookSP params);

-    void addVisitCount(@Param("bookId") Long bookId);
+    void addVisitCount(@Param("bookId") Long bookId, @Param("date") Date date);

    List<Book> listRecBookByCatId(@Param("catId") Integer catId);

    void addCommentCount(@Param("bookId") Long bookId);

-    List<Book> queryNetworkPicBooks(@Param("limit") Integer limit,@Param("offset") Integer offset);
+    List<Book> queryNetworkPicBooks(@Param("limit") Integer limit);

    /**
     * 按评分随机查询小说集合
--- a/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/BookService.java
@ -1,12 +1,14 @@
 package com.java2nb.novel.service;


+import com.github.pagehelper.PageInfo;
 import com.java2nb.novel.search.BookSP;
 import com.java2nb.novel.vo.BookCommentVO;
 import com.java2nb.novel.vo.BookSettingVO;
 import com.java2nb.novel.entity.*;
 import com.java2nb.novel.vo.BookVO;

+import java.util.Date;
 import java.util.List;
 import java.util.Map;

@ -44,9 +46,9 @@ public interface BookService {
     * @param params 搜索参数
     * @param page 页码
     * @param pageSize 分页大小
-     * @return 小说集合
+     * @return 小说集合分页信息
     * */
-    List<BookVO> searchByPage(BookSP params, int page, int pageSize);
+    PageInfo searchByPage(BookSP params, int page, int pageSize);

    /**
     * 查询小说分类列表
@ -179,10 +181,9 @@ public interface BookService {
    /**
     * 查询网络图片的小说
     * @param limit 查询条数
-     * @param offset 开始行数
     * @return 返回小说集合
     * */
-    List<Book> queryNetworkPicBooks(Integer limit, Integer offset);
+    List<Book> queryNetworkPicBooks(Integer limit);


    /**
@ -224,4 +225,13 @@ public interface BookService {
     * @param authorId 作者ID
     * */
    void addBookContent(Long bookId, String indexName, String content, Long authorId);
+
+
+    /**
+     * 根据更新时间分页查询书籍列表
+     * @param startDate 开始时间，包括该时间
+     * @param limit 查询数量
+     * @return 书籍列表
+     * */
+    List<Book> queryBookByUpdateTimeByPage(Date startDate, int limit);
 }
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@ -1,15 +1,14 @@
 package com.java2nb.novel.service.impl;

+import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
-import com.java2nb.novel.core.utils.BeanUtil;
-import com.java2nb.novel.core.utils.Constants;
-import com.java2nb.novel.core.utils.FileUtil;
-import com.java2nb.novel.core.utils.IdWorker;
+import com.java2nb.novel.core.utils.*;
 import com.java2nb.novel.entity.*;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.mapper.*;
@ -19,9 +18,18 @@ import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.vo.BookCommentVO;
 import com.java2nb.novel.vo.BookSettingVO;
 import com.java2nb.novel.vo.BookVO;
+import com.java2nb.novel.vo.EsBookVO;
+import io.searchbox.client.JestClient;
+import io.searchbox.core.*;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.sort.SortOrder;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
@ -31,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.orderbyhelper.OrderByHelper;

+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@ -50,14 +59,18 @@ import static org.mybatis.dynamic.sql.select.SelectDSL.select;
 */
@Service
@RequiredArgsConstructor
+@Slf4j
 public class BookServiceImpl implements BookService {

    /**
     * 本地图片保存路径
-     * */
+     */
    @Value("${pic.save.path}")
    private String picSavePath;

+    @Value("${spring.elasticsearch.enable}")
+    private Integer esEnable;
+
    private final FrontBookSettingMapper bookSettingMapper;

    private final FrontBookMapper bookMapper;
@ -76,6 +89,8 @@ public class BookServiceImpl implements BookService {

    private final AuthorService authorService;

+    private final JestClient jestClient;
+

    @SneakyThrows
    @Override
@ -83,24 +98,24 @@ public class BookServiceImpl implements BookService {
        String result = cacheService.get(CacheKey.INDEX_BOOK_SETTINGS_KEY);
        if (result == null || result.length() < Constants.OBJECT_JSON_CACHE_EXIST_LENGTH) {
            List<BookSettingVO> list = bookSettingMapper.listVO();
-            if(list.size() == 0) {
+            if (list.size() == 0) {
                //如果首页小说没有被设置，则初始化首页小说设置
                list = initIndexBookSetting();
            }
            result = new ObjectMapper().writeValueAsString(list.stream().collect(Collectors.groupingBy(BookSettingVO::getType)));
            cacheService.set(CacheKey.INDEX_BOOK_SETTINGS_KEY, result);
        }
-        return new ObjectMapper().readValue(result,Map.class);
+        return new ObjectMapper().readValue(result, Map.class);
    }


    /**
     * 初始化首页小说设置
-     * */
+     */
    private List<BookSettingVO> initIndexBookSetting() {
        Date currentDate = new Date();
-        List<Book> books =  bookMapper.selectIdsByScoreAndRandom(Constants.INDEX_BOOK_SETTING_NUM);
-        if(books.size() == Constants.INDEX_BOOK_SETTING_NUM) {
+        List<Book> books = bookMapper.selectIdsByScoreAndRandom(Constants.INDEX_BOOK_SETTING_NUM);
+        if (books.size() == Constants.INDEX_BOOK_SETTING_NUM) {
            List<BookSetting> bookSettingList = new ArrayList<>(Constants.INDEX_BOOK_SETTING_NUM);
            List<BookSettingVO> bookSettingVOList = new ArrayList<>(Constants.INDEX_BOOK_SETTING_NUM);
            for (int i = 0; i < books.size(); i++) {
@ -114,7 +129,7 @@ public class BookServiceImpl implements BookService {
                    type = 2;
                } else if (i < 26) {
                    type = 3;
-                }else{
+                } else {
                    type = 4;
                }
                BookSettingVO bookSettingVO = new BookSettingVO();
@ -126,8 +141,8 @@ public class BookServiceImpl implements BookService {
                bookSetting.setUpdateTime(currentDate);
                bookSettingList.add(bookSetting);

-                BeanUtils.copyProperties(book,bookSettingVO);
-                BeanUtils.copyProperties(bookSetting,bookSettingVO);
+                BeanUtils.copyProperties(book, bookSettingVO);
+                BeanUtils.copyProperties(bookSetting, bookSettingVO);
                bookSettingVOList.add(bookSettingVO);
            }

@ -164,25 +179,174 @@ public class BookServiceImpl implements BookService {
        List<BookVO> result = (List<BookVO>) cacheService.getObject(CacheKey.INDEX_UPDATE_BOOK_KEY);
        if (result == null || result.size() == 0) {
            List<Book> bookPOList = listRank((byte) 2, 23);
-            result = BeanUtil.copyList(bookPOList,BookVO.class);
+            result = BeanUtil.copyList(bookPOList, BookVO.class);
            cacheService.setObject(CacheKey.INDEX_UPDATE_BOOK_KEY, result, 60 * 10);
        }
        return result;
    }

    @Override
-    public List<BookVO> searchByPage(BookSP params, int page, int pageSize) {
-        PageHelper.startPage(page, pageSize);
+    public PageInfo searchByPage(BookSP params, int page, int pageSize) {
+
+
        if (params.getUpdatePeriod() != null) {
            long cur = System.currentTimeMillis();
            long period = params.getUpdatePeriod() * 24 * 3600 * 1000;
            long time = cur - period;
            params.setUpdateTimeMin(new Date(time));
        }
+
+        if (esEnable == 1) {
+
+
+            try {
+                List<EsBookVO> bookList = new ArrayList<>(0);
+
+                //使用搜索引擎搜索
+                BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+                // 构造查询哪个字段
+                if (StringUtils.isNoneBlank(params.getKeyword())) {
+                    boolQueryBuilder = boolQueryBuilder.must(QueryBuilders.queryStringQuery(params.getKeyword()));
+                }
+
+                // 作品方向
+                if (params.getWorkDirection() != null) {
+                    boolQueryBuilder.filter(QueryBuilders.termQuery("workDirection", params.getWorkDirection()));
+                }
+
+                // 分类
+                if (params.getCatId() != null) {
+                    boolQueryBuilder.filter(QueryBuilders.termQuery("catId", params.getCatId()));
+                }
+                if (params.getBookStatus() != null) {
+                    boolQueryBuilder.filter(QueryBuilders.termQuery("bookStatus", params.getBookStatus()));
+                }
+
+                if (params.getWordCountMin() == null) {
+                    params.setWordCountMin(0);
+                }
+                if (params.getWordCountMax() == null) {
+                    params.setWordCountMax(Integer.MAX_VALUE);
+                }
+
+                boolQueryBuilder.filter(QueryBuilders.rangeQuery("wordCount").gte(params.getWordCountMin()).lte(params.getWordCountMax()));
+
+                if (params.getUpdateTimeMin() != null) {
+                    boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(params.getUpdateTimeMin()));
+                }
+
+
+
+                SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+                searchSourceBuilder.query(boolQueryBuilder);
+
+
+                Count count = new Count.Builder().addIndex("novel").addType("book")
+                        .query(searchSourceBuilder.toString()).build();
+                CountResult results = jestClient.execute(count);
+                Double total = results.getCount();
+
+
+                // 高亮字段
+                HighlightBuilder highlightBuilder = new HighlightBuilder();
+                highlightBuilder.field("authorName");
+                highlightBuilder.field("bookName");
+                highlightBuilder.field("bookDesc");
+                highlightBuilder.field("lastIndexName");
+                highlightBuilder.field("catName");
+                highlightBuilder.preTags("<span style='color:red'>").postTags("</span>");
+                highlightBuilder.fragmentSize(20000);
+                searchSourceBuilder.highlighter(highlightBuilder);
+
+
+                //设置排序
+                if (params.getSort() != null) {
+                    searchSourceBuilder.sort(StringUtil.camelName(params.getSort()), SortOrder.DESC);
+                }
+
+                // 设置分页
+                searchSourceBuilder.from((page - 1) * pageSize);
+                searchSourceBuilder.size(pageSize);
+
+                // 构建Search对象
+                Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex("novel").addType("book").build();
+                log.debug(search.toString());
+                SearchResult result;
+                result = jestClient.execute(search);
+                if (result.isSucceeded()) {
+                    log.debug(result.getJsonString());
+
+                    Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class);
+                    if (resultMap.get("hits") != null) {
+                        Map hitsMap = (Map) resultMap.get("hits");
+                        if (hitsMap.size() > 0 && hitsMap.get("hits") != null) {
+                            List hitsList = (List) hitsMap.get("hits");
+                            if (hitsList.size() > 0 && result.getSourceAsString() != null) {
+
+                                JavaType jt = new ObjectMapper().getTypeFactory().constructParametricType(ArrayList.class, EsBookVO.class);
+                                bookList = new ObjectMapper().readValue("[" + result.getSourceAsString() + "]", jt);
+
+                                if (bookList != null) {
+                                    for (int i = 0; i < bookList.size(); i++) {
+                                        hitsMap = (Map) hitsList.get(i);
+                                        Map highlightMap = (Map) hitsMap.get("highlight");
+                                        if (highlightMap != null && highlightMap.size() > 0) {
+
+                                            List<String> authorNameList = (List<String>) highlightMap.get("authorName");
+                                            if (authorNameList != null && authorNameList.size() > 0) {
+                                                bookList.get(i).setAuthorName(authorNameList.get(0));
+                                            }
+
+                                            List<String> bookNameList = (List<String>) highlightMap.get("bookName");
+                                            if (bookNameList != null && bookNameList.size() > 0) {
+                                                bookList.get(i).setBookName(bookNameList.get(0));
+                                            }
+
+                                            List<String> bookDescList = (List<String>) highlightMap.get("bookDesc");
+                                            if (bookDescList != null && bookDescList.size() > 0) {
+                                                bookList.get(i).setBookDesc(bookDescList.get(0));
+                                            }
+
+                                            List<String> lastIndexNameList = (List<String>) highlightMap.get("lastIndexName");
+                                            if (lastIndexNameList != null && lastIndexNameList.size() > 0) {
+                                                bookList.get(i).setLastIndexName(lastIndexNameList.get(0));
+                                            }
+
+                                            List<String> catNameList = (List<String>) highlightMap.get("catName");
+                                            if (catNameList != null && catNameList.size() > 0) {
+                                                bookList.get(i).setCatName(catNameList.get(0));
+                                            }
+
+
+                                        }
+                                    }
+
+
+                                }
+                            }
+                        }
+                    }
+
+                    PageInfo<EsBookVO> pageInfo = new PageInfo<>(bookList);
+                    pageInfo.setTotal(total.longValue());
+                    pageInfo.setPageNum(page);
+                    pageInfo.setPageSize(pageSize);
+                    return pageInfo;
+                }
+            }catch (Exception e){
+                log.error(e.getMessage(),e);
+            }
+
+
+        }
+        PageHelper.startPage(page, pageSize);
+
        if (StringUtils.isNotBlank(params.getSort())) {
            OrderByHelper.orderBy(params.getSort() + " desc");
        }
-        return bookMapper.searchByPage(params);
+        return new PageInfo<>(bookMapper.searchByPage(params));
+
+
    }

    @Override
@ -197,7 +361,7 @@ public class BookServiceImpl implements BookService {

    @Override
    public Book queryBookDetail(Long bookId) {
-        SelectStatementProvider selectStatement = select(id, catName, catId, picUrl, bookName, authorId, authorName, bookDesc, bookStatus, visitCount, wordCount, lastIndexId, lastIndexName, lastIndexUpdateTime,score,status)
+        SelectStatementProvider selectStatement = select(book.allColumns())
                .from(book)
                .where(id, isEqualTo(bookId))
                .build()
@ -206,15 +370,15 @@ public class BookServiceImpl implements BookService {
    }

    @Override
-    public List<BookIndex> queryIndexList(Long bookId,String orderBy, Integer limit) {
-        if(StringUtils.isNotBlank(orderBy)){
+    public List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer limit) {
+        if (StringUtils.isNotBlank(orderBy)) {
            OrderByHelper.orderBy(orderBy);
        }
-        if(limit != null){
-            PageHelper.startPage(1,limit);
+        if (limit != null) {
+            PageHelper.startPage(1, limit);
        }

-        SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.updateTime,BookIndexDynamicSqlSupport.isVip)
+        SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.updateTime, BookIndexDynamicSqlSupport.isVip)
                .from(bookIndex)
                .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId))
                .build()
@ -225,7 +389,7 @@ public class BookServiceImpl implements BookService {

    @Override
    public BookIndex queryBookIndex(Long bookIndexId) {
-        SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.wordCount, BookIndexDynamicSqlSupport.updateTime,BookIndexDynamicSqlSupport.isVip)
+        SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.wordCount, BookIndexDynamicSqlSupport.updateTime, BookIndexDynamicSqlSupport.isVip)
                .from(bookIndex)
                .where(BookIndexDynamicSqlSupport.id, isEqualTo(bookIndexId))
                .build()
@ -271,7 +435,7 @@ public class BookServiceImpl implements BookService {

    @Override
    public BookContent queryBookContent(Long bookIndexId) {
-        SelectStatementProvider selectStatement = select(BookContentDynamicSqlSupport.id,BookContentDynamicSqlSupport.content)
+        SelectStatementProvider selectStatement = select(BookContentDynamicSqlSupport.id, BookContentDynamicSqlSupport.content)
                .from(bookContent)
                .where(BookContentDynamicSqlSupport.indexId, isEqualTo(bookIndexId))
                .limit(1)
@ -305,7 +469,7 @@ public class BookServiceImpl implements BookService {
        }
        SelectStatementProvider selectStatement = select(id, catId, catName, bookName, lastIndexId, lastIndexName, authorId, authorName, picUrl, bookDesc, wordCount, lastIndexUpdateTime)
                .from(book)
-                .where(wordCount,isGreaterThan(0))
+                .where(wordCount, isGreaterThan(0))
                .orderBy(sortSpecification)
                .limit(limit)
                .build()
@ -316,8 +480,7 @@ public class BookServiceImpl implements BookService {

    @Override
    public void addVisitCount(Long bookId) {
-        bookMapper.addVisitCount(bookId);
-
+        bookMapper.addVisitCount(bookId, new Date());
    }

    @Override
@ -349,10 +512,10 @@ public class BookServiceImpl implements BookService {
    }

    @Override
-    public List<BookCommentVO> listCommentByPage(Long userId,Long bookId, int page, int pageSize) {
+    public List<BookCommentVO> listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
        PageHelper.startPage(page, pageSize);
        OrderByHelper.orderBy("t1.create_time desc");
-        return bookCommentMapper.listCommentByPage(userId,bookId);
+        return bookCommentMapper.listCommentByPage(userId, bookId);
    }

    @Transactional(rollbackFor = Exception.class)
@ -361,11 +524,11 @@ public class BookServiceImpl implements BookService {
        //判断该用户是否已评论过该书籍
        SelectStatementProvider selectStatement = select(count(BookCommentDynamicSqlSupport.id))
                .from(bookComment)
-                .where(BookCommentDynamicSqlSupport.createUserId,isEqualTo(userId))
-                .and(BookCommentDynamicSqlSupport.bookId,isEqualTo(comment.getBookId()))
+                .where(BookCommentDynamicSqlSupport.createUserId, isEqualTo(userId))
+                .and(BookCommentDynamicSqlSupport.bookId, isEqualTo(comment.getBookId()))
                .build()
                .render(RenderingStrategies.MYBATIS3);
-        if(bookCommentMapper.count(selectStatement)>0){
+        if (bookCommentMapper.count(selectStatement) > 0) {
            throw new BusinessException(ResponseStatus.HAS_COMMENTS);
        }
        //增加评论
@ -374,7 +537,7 @@ public class BookServiceImpl implements BookService {
        bookCommentMapper.insertSelective(comment);
        //增加书籍评论数
        bookMapper.addCommentCount(comment.getBookId());
-        
+
    }

    @Override
@ -382,14 +545,14 @@ public class BookServiceImpl implements BookService {
        Long authorId;
        SelectStatementProvider selectStatement = select(BookAuthorDynamicSqlSupport.id)
                .from(BookAuthorDynamicSqlSupport.bookAuthor)
-                .where(BookAuthorDynamicSqlSupport.penName,isEqualTo(authorName))
+                .where(BookAuthorDynamicSqlSupport.penName, isEqualTo(authorName))
                .build()
                .render(RenderingStrategies.MYBATIS3);
        List<BookAuthor> bookAuthors = bookAuthorMapper.selectMany(selectStatement);
-        if(bookAuthors.size()>0){
+        if (bookAuthors.size() > 0) {
            //作者存在
            authorId = bookAuthors.get(0).getId();
-        }else{
+        } else {
            //作者不存在，先创建作者
            Date currentDate = new Date();
            authorId = new IdWorker().nextId();
@ -409,18 +572,17 @@ public class BookServiceImpl implements BookService {
    }


-
    @Override
    public Long queryIdByNameAndAuthor(String bookName, String author) {
        //查询小说ID
        SelectStatementProvider selectStatement = select(id)
                .from(book)
-                .where(BookDynamicSqlSupport.bookName,isEqualTo(bookName))
-                .and(BookDynamicSqlSupport.authorName,isEqualTo(authorName))
+                .where(BookDynamicSqlSupport.bookName, isEqualTo(bookName))
+                .and(BookDynamicSqlSupport.authorName, isEqualTo(authorName))
                .build()
                .render(RenderingStrategies.MYBATIS3);
        List<Book> books = bookMapper.selectMany(selectStatement);
-        if(books.size()>0){
+        if (books.size() > 0) {
            return books.get(0).getId();
        }
        return null;
@ -430,7 +592,7 @@ public class BookServiceImpl implements BookService {
    public List<Integer> queryIndexNumByBookId(Long bookId) {
        SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.indexNum)
                .from(BookIndexDynamicSqlSupport.bookIndex)
-                .where(BookIndexDynamicSqlSupport.bookId,isEqualTo(bookId))
+                .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId))
                .build()
                .render(RenderingStrategies.MYBATIS3);

@ -438,21 +600,21 @@ public class BookServiceImpl implements BookService {
    }

    @Override
-    public List<Book> queryNetworkPicBooks(Integer limit, Integer offset) {
-        return bookMapper.queryNetworkPicBooks(limit,offset);
+    public List<Book> queryNetworkPicBooks(Integer limit) {
+        return bookMapper.queryNetworkPicBooks(limit);
    }

    @Override
    public void updateBookPicToLocal(String picUrl, Long bookId) {

-        picUrl = FileUtil.network2Local(picUrl,picSavePath, Constants.LOCAL_PIC_PREFIX);
+        picUrl = FileUtil.network2Local(picUrl, picSavePath, Constants.LOCAL_PIC_PREFIX);

        bookMapper.update(update(book)
                .set(BookDynamicSqlSupport.picUrl)
                .equalTo(picUrl)
                .set(updateTime)
                .equalTo(new Date())
-                .where(id,isEqualTo(bookId))
+                .where(id, isEqualTo(bookId))
                .build()
                .render(RenderingStrategies.MYBATIS3));

@ -461,7 +623,7 @@ public class BookServiceImpl implements BookService {
    @Override
    public List<Book> listBookPageByUserId(Long userId, int page, int pageSize) {

-        PageHelper.startPage(page,pageSize);
+        PageHelper.startPage(page, pageSize);

        SelectStatementProvider selectStatement = select(id, bookName, visitCount, lastIndexName, status)
                .from(book)
@ -476,10 +638,11 @@ public class BookServiceImpl implements BookService {
    @Override
    public void addBook(Book book, Long authorId, String penName) {
        //判断小说名是否存在
-        if(queryIdByNameAndAuthor(book.getBookName(),penName)!=null){
+        if (queryIdByNameAndAuthor(book.getBookName(), penName) != null) {
            //该作者发布过此书名的小说
            throw new BusinessException(ResponseStatus.BOOKNAME_EXISTS);
-        };
+        }
+        ;
        book.setAuthorName(penName);
        book.setAuthorId(authorId);
        book.setVisitCount(0L);
@ -497,18 +660,18 @@ public class BookServiceImpl implements BookService {
        bookMapper.update(update(book)
                .set(BookDynamicSqlSupport.status)
                .equalTo(status)
-                .where(id,isEqualTo(bookId))
-                .and(BookDynamicSqlSupport.authorId,isEqualTo(authorId))
+                .where(id, isEqualTo(bookId))
+                .and(BookDynamicSqlSupport.authorId, isEqualTo(authorId))
                .build()
                .render(RenderingStrategies.MYBATIS3));
    }

-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
    @Override
    public void addBookContent(Long bookId, String indexName, String content, Long authorId) {

        Book book = queryBookDetail(bookId);
-        if(!authorId.equals(book.getAuthorId())){
+        if (!authorId.equals(book.getAuthorId())) {
            //并不是更新自己的小说
            return;
        }
@ -525,15 +688,15 @@ public class BookServiceImpl implements BookService {
                .set(BookDynamicSqlSupport.lastIndexUpdateTime)
                .equalTo(currentDate)
                .set(BookDynamicSqlSupport.wordCount)
-                .equalTo(book.getWordCount()+wordCount)
-                .where(id,isEqualTo(bookId))
-                .and(BookDynamicSqlSupport.authorId,isEqualTo(authorId))
+                .equalTo(book.getWordCount() + wordCount)
+                .where(id, isEqualTo(bookId))
+                .and(BookDynamicSqlSupport.authorId, isEqualTo(authorId))
                .build()
                .render(RenderingStrategies.MYBATIS3));
        //更新小说目录表
        int indexNum = 0;
-        if(book.getLastIndexId() != null){
-            indexNum =  queryBookIndex(book.getLastIndexId()).getIndexNum()+1;
+        if (book.getLastIndexId() != null) {
+            indexNum = queryBookIndex(book.getLastIndexId()).getIndexNum() + 1;
        }
        BookIndex lastBookIndex = new BookIndex();
        lastBookIndex.setId(lastIndexId);
@ -553,7 +716,19 @@ public class BookServiceImpl implements BookService {
        bookContentMapper.insertSelective(bookContent);


+    }

+    @Override
+    public List<Book> queryBookByUpdateTimeByPage(Date startDate,  int limit) {
+
+
+        return bookMapper.selectMany(select(book.allColumns())
+                .from(book)
+                .where(updateTime, isGreaterThan(startDate))
+                .orderBy(updateTime)
+                .limit(limit)
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
    }


--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/UserServiceImpl.java
@ -86,13 +86,14 @@ public class UserServiceImpl implements UserService {
        UserDetails userDetails = new UserDetails();
        userDetails.setId(id);
        userDetails.setUsername(entity.getUsername());
+        userDetails.setNickName(entity.getNickName());
        return userDetails;
    }

    @Override
    public UserDetails login(UserForm form) {
        //根据用户名密码查询记录
-        SelectStatementProvider selectStatement = select(id, username)
+        SelectStatementProvider selectStatement = select(id, username,nickName)
                .from(user)
                .where(username, isEqualTo(form.getUsername()))
                .and(password, isEqualTo(MD5Util.MD5Encode(form.getPassword(), Charsets.UTF_8.name())))
@ -104,7 +105,9 @@ public class UserServiceImpl implements UserService {
        }
        //生成UserDetail对象并返回
        UserDetails userDetails = new UserDetails();
-        userDetails.setId(users.get(0).getId());
+        User user = users.get(0);
+        userDetails.setId(user.getId());
+        userDetails.setNickName(user.getNickName());
        userDetails.setUsername(form.getUsername());
        return userDetails;
    }
--- a/novel-front/src/main/java/com/java2nb/novel/vo/EsBookVO.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/EsBookVO.java
@ -0,0 +1,85 @@
+package com.java2nb.novel.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.java2nb.novel.entity.Book;
+import lombok.Data;
+
+import javax.annotation.Generated;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class EsBookVO  {
+
+    private Long id;
+
+    
+    private Byte workDirection;
+
+    
+    private Integer catId;
+
+    
+    private String catName;
+
+    
+    private String picUrl;
+
+    
+    private String bookName;
+
+    
+    private Long authorId;
+
+    
+    private String authorName;
+
+    
+    private String bookDesc;
+
+    
+    private Float score;
+
+    
+    private Byte bookStatus;
+
+    
+    private Long visitCount;
+
+    
+    private Integer wordCount;
+
+    
+    private Integer commentCount;
+
+    
+    private Long lastIndexId;
+
+    
+    private String lastIndexName;
+
+    private String lastIndexUpdateTime;
+
+    
+    private Byte isVip;
+
+    
+    private Byte status;
+
+    
+
+    
+    private Integer crawlSourceId;
+
+    
+    private String crawlBookId;
+
+    
+
+    private Byte crawlIsStop;
+
+
+}
--- a/novel-front/src/main/resources/application.yml
+++ b/novel-front/src/main/resources/application.yml
@ -6,6 +6,15 @@ spring:
    active: dev
    include: alipay

+
+  elasticsearch:
+    #是否开启搜索引擎，1：开启，0：不开启
+    enable: 0
+    jest:
+      uris: http://127.0.0.1:9200
+
+
+
 jwt:
  secret: novel!#20191230
  expiration: 604800
@ -23,7 +32,7 @@ xss:
  # 排除链接（多个用逗号分隔）
  excludes: /system/notice/*
  # 匹配链接 （多个用逗号分隔）
-  urlPatterns: /book/addBookComment,/user/addFeedBack
+  urlPatterns: /book/addBookComment,/user/addFeedBack,/author/addBook,/author/addBookContent,/author/register.html



--- a/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
+++ b/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
@ -34,8 +34,9 @@

    </select>

-    <update id="addVisitCount" parameterType="long">
-        update book set visit_count = visit_count + 1 where id = #{bookId}
+    <update id="addVisitCount" >
+        update book set visit_count = visit_count + 1 , update_time = #{date}
+        where id = #{bookId}
    </update>

    <select id="listRecBookByCatId" parameterType="int" resultType="com.java2nb.novel.entity.Book">
@ -54,8 +55,8 @@
    <select id="queryNetworkPicBooks" resultType="com.java2nb.novel.entity.Book">
        select
        id,pic_url from book
-        where pic_url like 'http://%' or pic_url like 'https://%'
-        limit #{offset},#{limit}
+        where pic_url like 'http%'
+        limit #{limit}
    </select>

    <select id="selectIdsByScoreAndRandom" parameterType="int" resultType="com.java2nb.novel.entity.Book">
--- a/novel-front/src/main/resources/static/images/default.gif
+++ b/novel-front/src/main/resources/static/images/default.gif
--- a/novel-front/src/main/resources/static/javascript/common.js
+++ b/novel-front/src/main/resources/static/javascript/common.js
@ -65,7 +65,7 @@ if(!token){
        success: function(data){
            if(data.code == 200){
                $(".user_link").html("<i class=\"line mr20\">|</i>" +
-                    "<a href=\"/user/userinfo.html\"  class=\"mr15\">"+data.data.username+"</a>" +
+                    "<a href=\"/user/userinfo.html\"  class=\"mr15\">"+data.data.nickName+"</a>" +
                    "<a href=\"javascript:logout()\" >退出</a>");
                ;
                if("/user/login.html" == window.location.pathname){
--- a/novel-front/src/main/resources/templates/author/book_add.html
+++ b/novel-front/src/main/resources/templates/author/book_add.html
@ -130,33 +130,43 @@
 <script src="/javascript/header.js" type="text/javascript"></script>
 <script src="/javascript/user.js" type="text/javascript"></script>
 <script language="javascript" type="text/javascript">
+
+    var lock = false;
    function addBook() {
+        if(lock){
+            return;
+        }
+        lock = true;
+


        var bookName = $("#bookName").val();
        if(!bookName){
            $("#LabErr").html("小说名不能为空！");
+            lock = false;
            return;
        }
        if(bookName.length > 20){
            $("#LabErr").html("小说名太长！");
+            lock = false;
            return;
        }

        var picUrl = $("#picUrl").val();
        if(!picUrl){
            $("#LabErr").html("封面图片不能为空！");
+            lock = false;
            return;
        }

        var bookDesc = $("#bookDesc").val();
        if(!bookDesc){
            $("#LabErr").html("简介不能为空！");
+            lock = false;
            return;
        }


-
        $.ajax({
            type: "POST",
            url: "/author/addBook",
@ -171,11 +181,13 @@


                } else {
+                    lock = false;
                    $("#LabErr").html(data.msg);
                }

            },
            error: function () {
+                lock = false;
                layer.alert('网络异常');
            }
        })
--- a/novel-front/src/main/resources/templates/author/content_add.html
+++ b/novel-front/src/main/resources/templates/author/content_add.html
@ -58,10 +58,8 @@
                                <b>章节名：</b>
                                <li><input type="text" id="bookIndex" name="bookIndex" class="s_input" ></li>
                                <b>章节内容：</b>
-                                <input type="hidden" id="bookContent" name="bookContent"  >
-                                <div style="width:600px" id="contentEditor">
-
-                                </div>
+                                <textarea name="bookContent" rows="30" cols="80" id="bookContent"
+                                          class="textarea"></textarea>
                                <li style="margin-top: 10px"><input type="button" onclick="addBookContent()" name="btnRegister" value="提交"
                                           id="btnRegister" class="btn_red">

@ -114,43 +112,18 @@
 <script src="/javascript/header.js" type="text/javascript"></script>
 <script src="/javascript/user.js" type="text/javascript"></script>
 <script src="/javascript/common.js" type="text/javascript"></script>
-<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>

 <script language="javascript" type="text/javascript">

-    var E = window.wangEditor;
-    var editor2 = new E('#contentEditor');
-    // 自定义菜单配置
-    editor2.customConfig.menus = [
-        'head',  // 标题
-        'bold',  // 粗体
-        'fontSize',  // 字号
-        'fontName',  // 字体
-        'italic',  // 斜体
-        'underline',  // 下划线
-        'strikeThrough',  // 删除线
-        'foreColor',  // 文字颜色
-        //'backColor',  // 背景颜色
-        //'link',  // 插入链接
-        'list',  // 列表
-        'justify',  // 对齐方式
-        'quote',  // 引用
-        'emoticon',  // 表情
-        'image',  // 插入图片
-        //'table',  // 表格
-        //'video',  // 插入视频
-        //'code',  // 插入代码
-        'undo',  // 撤销
-        'redo'  // 重复
-    ];
-    editor2.customConfig.onchange = function (html) {
-        // html 即变化之后的内容
-        $("#bookContent").val(html);
-    }
-    editor2.create();

+    var lock = false;
    function addBookContent() {

+        if(lock){
+            return;
+        }
+        lock = true;
+

        var bookId = getSearchString("bookId");

@ -158,12 +131,14 @@
        var indexName = $("#bookIndex").val();
        if(!indexName){
            $("#LabErr").html("章节名不能为空！");
+            lock = false;
            return;
        }

        var content = $("#bookContent").val();
-        if(!content && content.length<=13){
+        if(!content){
            $("#LabErr").html("章节内容不能为空！");
+            lock = false;
            return;
        }

@ -182,11 +157,13 @@


                } else {
+                    lock = false;
                    $("#LabErr").html(data.msg);
                }

            },
            error: function () {
+                lock = false;
                layer.alert('网络异常');
            }
        })
--- a/novel-front/src/main/resources/templates/book/book_content.html
+++ b/novel-front/src/main/resources/templates/book/book_content.html
@ -2,7 +2,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
-    <title th:text="${book.bookName}+'_'+${bookIndex.indexName}+'_'+#{website.name}"></title>
+    <title th:utext="${book.bookName}+'_'+${bookIndex.indexName}+'_'+#{website.name}"></title>
    <meta name="keywords" th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节,'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'" />
    <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+#{website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+#{website.name}+'。'" />
    <link rel="stylesheet" href="/css/read.css" />
@ -74,7 +74,7 @@
            <div class="readWrap">
                <div class="bookNav">
                    <a href="/" >首页 </a>&gt; <a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}">
-                </a>&gt; <a th:href="'/book/'+${book.id}+'.html'" th:text="${book.bookName}">
+                </a>&gt; <a th:href="'/book/'+${book.id}+'.html'" th:utext="${book.bookName}">

                </a>
                </div>
@ -82,11 +82,11 @@
                    <div class="textbox cf">

                        <div class="book_title">
-                            <h1 th:text="${bookIndex.indexName}">
+                            <h1 th:utext="${bookIndex.indexName}">
                                </h1>
                            <div class="textinfo">
                                类别：<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>
-                                作者：<a th:href="'javascript:searchByK(\''+${book.authorName}+'\')'" th:text="${book.authorName}"></a><span th:text="'字数：'+${bookIndex.wordCount}"></span><span th:text="'更新时间：'+${#dates.format(bookIndex.updateTime, 'yy/MM/dd HH:mm:ss')}"></span>
+                                作者：<a th:href="'javascript:searchByK(\''+${book.authorName}+'\')'" th:utext="${book.authorName}"></a><span th:text="'字数：'+${bookIndex.wordCount}"></span><span th:text="'更新时间：'+${#dates.format(bookIndex.updateTime, 'yy/MM/dd HH:mm:ss')}"></span>
                            </div>
                        </div>
                        <div class="txtwrap" th:if="${needBuy}">
--- a/novel-front/src/main/resources/templates/book/book_detail.html
+++ b/novel-front/src/main/resources/templates/book/book_detail.html
@ -2,7 +2,7 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
-    <title th:text="${book.bookName}+'_'+${book.authorName}+'_'+${book.bookName}+'txt下载'+'_'+${book.bookName}+'无弹窗_'+#{website.name}"></title>
+    <title th:utext="${book.bookName}+'_'+${book.authorName}+'_'+${book.bookName}+'txt下载'+'_'+${book.bookName}+'无弹窗_'+#{website.name}"></title>
    <meta name="keywords"
          th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'"/>
    <meta name="description"
@ -23,7 +23,7 @@
 <div class="main box_center cf mb50">
    <div class="nav_sub">
        <a href="/" th:text="#{website.name}"></a>&gt;<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>&gt;<a
-            th:href="'/book/'+${book.id}+'.html'" th:text="${book.bookName}"></a>
+            th:href="'/book/'+${book.id}+'.html'" th:utext="${book.bookName}"></a>
    </div>
    <div class="channelWrap channelBookInfo cf">
        <div class="bookCover cf">
@ -31,8 +31,8 @@
                                                      th:attr="alt=${book.bookName}"/></a>
            <div class="book_info">
                <div class="tit">
-                    <h1 th:text="${book.bookName}"></h1><!--<i class="vip_b">VIP</i>--><a class="author"
-                                                                                          th:text="${book.authorName}+' 著'"></a>
+                    <h1 th:utext="${book.bookName}"></h1><!--<i class="vip_b">VIP</i>--><a class="author"
+                                                                                          th:utext="${book.authorName}+' 著'"></a>
                </div>
                <ul class="list">
                    <li><span class="item">类别：<em th:text="${book.catName}"></em></span>
@ -70,7 +70,7 @@
                        </div>
                        <ul class="list cf">
                            <li>
-                                <span class="fl font16"> <a th:href="'/book/'+${book.id}+'/'+${book.lastIndexId}+'.html'" th:text="${book.lastIndexName}"><!--<i class="vip">VIP</i>--></a></span>
+                                <span class="fl font16"> <a th:href="'/book/'+${book.id}+'/'+${book.lastIndexId}+'.html'" th:utext="${book.lastIndexName}"><!--<i class="vip">VIP</i>--></a></span>
                                <span class="black9 fr"
                                      th:text="'更新时间：'+${#dates.format(book.lastIndexUpdateTime, 'yy/MM/dd HH:mm:ss')}"></span>
                            </li>
@ -143,7 +143,7 @@
                    <div class="msg">
                        <span class="icon_qyzz">签约作家</span>
                        <h4><a th:href="'javascript:searchByK(\''+${book.authorName}+'\')'"
-                               th:text="${book.authorName}"></a></h4>
+                               th:utext="${book.authorName}"></a></h4>
                    </div>
                </div>
                <div class="author_intro cf">
--- a/novel-front/src/main/resources/templates/book/book_index.html
+++ b/novel-front/src/main/resources/templates/book/book_index.html
@ -2,7 +2,7 @@
        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
-    <title th:text="${book.bookName}+'目录,'+${book.bookName}+'最新章节列表_'+#{website.name}"></title>
+    <title th:utext="${book.bookName}+'目录,'+${book.bookName}+'最新章节列表_'+#{website.name}"></title>
    <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'目录,'+${book.bookName}+'最新章节列表'"/>
    <meta name="description"
          th:content="#{website.name}+'小说为您提供'+${book.bookName}+'目录,'+${book.bookName}+'最新章节列表,'+${book.bookName}+'全文阅读,'+${book.bookName}+'免费阅读,'+${book.bookName}+'下载'"/>
@ -17,7 +17,7 @@
 <div class="main box_center cf">
    <div class="nav_sub">
        <a href="/" th:text="#{website.name}"></a>&gt;<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a>&gt;<a
-            th:href="'/book/'+${book.id}+'.html'" th:text="${book.bookName}"></a>&gt;<a
+            th:href="'/book/'+${book.id}+'.html'" th:utext="${book.bookName}"></a>&gt;<a
            th:href="'/book/indexList-'+${book.id}+'.html'">作品目录</a>
    </div>
    <div class="channelWrap channelChapterlist cf mb50">
@ -26,11 +26,11 @@
            <div class="bookCover cf">
                <div class="book_info1">
                    <div class="tit">
-                        <h1 th:text="${book.bookName}"></h1><!--<i class="vip_b">VIP</i>-->
+                        <h1 th:utext="${book.bookName}"></h1><!--<i class="vip_b">VIP</i>-->
                    </div>
                    <ul class="list">
                        <li>
-                            <span>作者：<a href="javascript:void(0)" th:text="${book.authorName}"></a></span>
+                            <span>作者：<a href="javascript:void(0)" th:utext="${book.authorName}"></a></span>
                            <span>类别：<a th:href="'/book/bookclass.html?c='+${book.catId}" th:text="${book.catName}"></a></span>
                            <span th:switch="${book.bookStatus}">状态：<em class="black3" th:case="'0'">连载中</em><em class="black3"
                                                                                  th:case="*">已完结</em></span>
@ -45,9 +45,9 @@
                <div class="dirList">
                    <ul th:each="bookIndex : ${bookIndexList}">
                        <li><a th:if="${bookIndex.isVip} != '1'" th:href="'/book/'+${book.id}+'/'+${bookIndex.id}+'.html'" >
-                            <span th:text="${bookIndex.indexName}"></span><i class="red" > [免费]</i>
+                            <span th:utext="${bookIndex.indexName}"></span><i class="red" > [免费]</i>
                        </a>
-                            <a th:if="${bookIndex.isVip} == '1'" th:href="'/book/'+${book.id}+'/'+${bookIndex.id}+'.html'" th:text="${bookIndex.indexName}">
+                            <a th:if="${bookIndex.isVip} == '1'" th:href="'/book/'+${book.id}+'/'+${bookIndex.id}+'.html'" th:utext="${bookIndex.indexName}">
                            </a></li>
                    </ul>
                </div>
--- a/novel-front/src/main/resources/templates/common/footer.html
+++ b/novel-front/src/main/resources/templates/common/footer.html
@ -2,7 +2,7 @@
    <div class="box_center cf">
        <div class="copyright">
            <ul >
-                <li class="menu"><a href="/?to=mobile">手机站</a><i class="line">|</i><a href="/">网站首页</a><i class="line">|</i><a href="/about/default.html" >关于我们</a><i class="line">|</i><a href="/about/contact.html" >联系我们</a><i class="line">|</i><a href="/user/feedback.html" >反馈留言</a><i class="line">|</i><a href="javascript:layer.alert('待开通，敬请期待！');" >作家专区</a></li>
+                <li class="menu"><a href="/?to=mobile">手机站</a><i class="line">|</i><a href="/">网站首页</a><i class="line">|</i><a href="/about/default.html" >关于我们</a><i class="line">|</i><a href="/about/contact.html" >联系我们</a><i class="line">|</i><a href="/user/feedback.html" >反馈留言</a><i class="line">|</i><a href="/author/index.html" >作家专区</a></li>
                <li th:text="'Copyright (C) '+#{website.domain}+' All rights reserved&nbsp;&nbsp;'+#{website.name}+'版权所有'"></li>

            </ul>
--- a/novel-front/src/main/resources/templates/mobile/book/book_content.html
+++ b/novel-front/src/main/resources/templates/mobile/book/book_content.html
@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta th:if="${catId == 9}" name="viewport" content="width=device-width, initial-scale=0.5, maximum-scale=1">
    <meta th:if="${catId != 9}" name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title th:text="${book.bookName}+${bookIndex.indexName}"></title>
+    <title th:utext="${book.bookName}+${bookIndex.indexName}"></title>

    <meta name="keywords" th:content="${book.bookName}+','+${bookIndex.indexName}">

@ -183,7 +183,7 @@
        <a href="javascript:history.go(-1)">
            <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe65c;</i></a>
    </div>
-    <a style="color: #ffffff;" th:href="'/book/'+ ${book.id} + '.html'"><b style="padding-left: 5%;float: left;width: 69%" class="line-limit-length" th:text="${bookIndex.indexName}+' '+${book.bookName}"></b></a>
+    <a style="color: #ffffff;" th:href="'/book/'+ ${book.id} + '.html'"><b style="padding-left: 5%;float: left;width: 69%" class="line-limit-length" th:utext="${bookIndex.indexName}+' '+${book.bookName}"></b></a>
    <div style="width:10%;float: right;margin-right: 10px"><a href="/">
        <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe68e;</i>
    </a>
--- a/novel-front/src/main/resources/templates/mobile/book/book_detail.html
+++ b/novel-front/src/main/resources/templates/mobile/book/book_detail.html
@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title th:text="${book.bookName}+'小说最新章节免费阅读和下载'"></title>
+    <title th:utext="${book.bookName}+'小说最新章节免费阅读和下载'"></title>

    <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'最新章节,'+${book.bookName}+'免费阅读,'+${book.bookName}+'TXT下载'">

@ -121,7 +121,7 @@
        <a href="javascript:history.go(-1)">
            <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe65c;</i></a>
    </div>
-    <b class="layui-icon" th:text="${book.bookName}"></b>
+    <b class="layui-icon" th:utext="${book.bookName}"></b>
    <div style="float: right;margin-right: 10px">
        <a href="/"><i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe68e;</i></a>
    </div>
@ -133,7 +133,7 @@

    </div>
        <div style="position:relative;padding: 10px 20px" class="layui-col-xs8 layui-col-sm8 layui-col-md8 layui-col-lg8">
-            <a th:href="'javascript:searchBooks(\''+ ${book.authorName}+'\')'"><div style=";color: #4c6978;" th:text="'作者：'+ ${book.authorName}"></div></a>
+            <a th:href="'javascript:searchBooks(\''+ ${book.authorName}+'\')'"><div style=";color: #4c6978;" th:utext="'作者：'+ ${book.authorName}"></div></a>
            <a th:href="'/book/book_ranking.html?catId='+${book.catId}"><div style="margin-top: 5px;color: #4c6978;" th:text="'类别：'+ ${book.catName}"></div></a>
            <div style="margin-top: 5px;color: #4c6978;" th:text="'状态：'+ ${book.bookStatus==0?'连载':'完结'}"></div>
            <div style="margin-top: 5px;color: #4c6978;">更新：<i th:text="${#dates.format(book.lastIndexUpdateTime, 'yy-MM-dd')}"></i></div>
--- a/novel-front/src/main/resources/templates/mobile/book/book_index.html
+++ b/novel-front/src/main/resources/templates/mobile/book/book_index.html
@ -5,7 +5,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title th:text="${book.bookName}+'最新免费章节目录列表'"></title>
+    <title th:utext="${book.bookName}+'最新免费章节目录列表'"></title>

    <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'最新章节'">

@ -48,7 +48,7 @@
        <a href="javascript:history.go(-1)">
            <i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe65c;</i></a>
    </div>
-    <a style="color: #ffffff;" th:href="'/book/'+ ${book.id} + '.html'"><b class="layui-icon" th:text="${book.bookName}"></b></a>
+    <a style="color: #ffffff;" th:href="'/book/'+ ${book.id} + '.html'"><b class="layui-icon" th:utext="${book.bookName}"></b></a>
    <div style="float: right;margin-right: 10px">
        <a href="/"><i style="font-size: 20px;color: #92B8B1;" class="layui-icon">&#xe68e;</i></a>
    </div>
@ -63,7 +63,7 @@

 <div class="layui-colla-content layui-show indexP layui-row">
    <p class="line-limit-length layui-col-xs12 layui-col-sm4 layui-col-md3 layui-col-lg2" style="padding-left:10px;height: 50px;line-height: 50px;" th:each="index : ${bookIndexList}">
-        <a th:href="'/book/'+${index.bookId}+'/'+${index.id}+'.html'" th:text="${index.indexName}">
+        <a th:href="'/book/'+${index.bookId}+'/'+${index.id}+'.html'" th:utext="${index.indexName}">

        </a>
    </p>
--- a/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
+++ b/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
@ -179,9 +179,13 @@
                    for (var i = 0; i < bookList.length; i++) {
                        var book = bookList[i];

-                        var end = book.bookDesc.indexOf("<");
+                        /*var end = book.bookDesc.indexOf("<");
                        if(end != -1) {
                            book.bookDesc = book.bookDesc.substring(0,end);
+                        }*/
+
+                        if(book.bookDesc){
+                            book.bookDesc = book.bookDesc.replace(/<[^>]+>/g,"").replace(/\s+/g,"").replace(/&nbsp;/g,"");
                        }

                        bookListHtml += ("<div class=\"layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
@ -202,7 +206,7 @@
                            "            </a>\n" +
                            "            <div style=\"margin-top: 5px;color: #4c6978;\">类别："+book.catName+"</div>\n" +
                            "            <div style=\"margin-top: 5px;color: #4c6978;\">状态："+(book.bookStatus==0?'连载':'完结')+"</div>\n" +
-                            "            <div style=\"margin-top: 5px;color: #4c6978;\">更新：<i>"+book.lastIndexUpdateTime+"</i>\n" +
+                            "            <div style=\"margin-top: 5px;color: #4c6978;\">更新：<i>"+book.lastIndexUpdateTime.substr(0,11)+"</i>\n" +
                            "            </div>\n" +
                            "            <div style=\"margin-top: 5px;color: #4c6978;\">简介："+(book.bookDesc?(book.bookDesc.length>20?(book.bookDesc.substr(0,20)+"..."):book.bookDesc):book.bookDesc)+"</div>\n" +
                            "\n" +
--- a/novel-front/src/main/resources/templates/mobile/index.html
+++ b/novel-front/src/main/resources/templates/mobile/index.html
@ -276,6 +276,10 @@
                for (var i = 0; i < 6; i++) {
                    var hotRecBook = hotRecBooks[i];

+                    if(hotRecBook.bookDesc){
+                        hotRecBook.bookDesc = hotRecBook.bookDesc.replace(/<[^>]+>/g,"").replace(/\s+/g,"");
+                    }
+
                    hotRecBooksHtml += ("<div style=\"margin-bottom: 5px\" class=\"layui-col-xs12 layui-col-sm6 layui-col-md4 layui-col-lg4\">\n" +
                        "                        <a href=\"/book/"+hotRecBook.bookId+".html\">\n" +
                        "                            <div class=\"layui-col-xs5 layui-col-sm4 layui-col-md4 layui-col-lg4\" >\n" +
@ -323,9 +327,8 @@
                for (var i = 0; i < 10; i++) {

                    var updateRankBook = updateRankBooks[i];
-                    var end = updateRankBook.bookDesc.indexOf("<");
-                    if(end != -1) {
-                        updateRankBook.bookDesc = updateRankBook.bookDesc.substring(0,end);
+                    if(updateRankBook.bookDesc){
+                        updateRankBook.bookDesc = updateRankBook.bookDesc.replace(/<[^>]+>/g,"").replace(/\s+/g,"");
                    }

                        updateRankBookHtml += ("<div style=\"padding-bottom: 30px\"\n" +
--- a/novel-front/src/main/resources/templates/user/set_name.html
+++ b/novel-front/src/main/resources/templates/user/set_name.html
@ -1,4 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
    <title th:text="'修改昵称_'+#{website.name}"></title>
@ -24,21 +25,26 @@
        <div class="my_r">
            <div class="my_info cf">
                <div class="my_info_txt">
-                        <div class="aspNetHidden">
-                            <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE" value="/wEPDwUKMTI5MzkzMzQyMw9kFgJmD2QWAmYPFgIeBFRleHQFqAE8YSBocmVmPSIvc2VhcmNoLmFzcHg/c2VhcmNoS2V5PeWWu+Wuiembr++8jOeLhOazve+8jOeBteW8gu+8jOWJjeS4luS7iueUn++8jOWGpeeOi+msvOWkqyIgdGFyZ2V0PSJfYmxhbmsiPuWWu+Wuiembr++8jOeLhOazve+8jOeBteW8gu+8jOWJjeS4luS7iueUn++8jOWGpeeOi+msvOWkqzwvYT5kZLj1Uo6akAHRsP9HH/tJWCPmjwlzm9tv02sZRfbbCnBA" />
-                        </div>
+                    <div class="aspNetHidden">
+                        <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE"
+                               value="/wEPDwUKMTI5MzkzMzQyMw9kFgJmD2QWAmYPFgIeBFRleHQFqAE8YSBocmVmPSIvc2VhcmNoLmFzcHg/c2VhcmNoS2V5PeWWu+Wuiembr++8jOeLhOazve+8jOeBteW8gu+8jOWJjeS4luS7iueUn++8jOWGpeeOi+msvOWkqyIgdGFyZ2V0PSJfYmxhbmsiPuWWu+Wuiembr++8jOeLhOazve+8jOeBteW8gu+8jOWJjeS4luS7iueUn++8jOWGpeeOi+msvOWkqzwvYT5kZLj1Uo6akAHRsP9HH/tJWCPmjwlzm9tv02sZRfbbCnBA"/>
+                    </div>

-                        <div class="aspNetHidden">
+                    <div class="aspNetHidden">

-                            <input type="hidden" name="__VIEWSTATEGENERATOR" id="__VIEWSTATEGENERATOR" value="6C876674" />
-                            <input type="hidden" name="__EVENTVALIDATION" id="__EVENTVALIDATION" value="/wEdAAO8SPdUDpH0Q7nHjeqbvI7ld2C+OxfjpZOniBJbql7XdnRgTJ25FWigbeFr84Vgoxdi/cg2vS37N0KER6F1nyr1wKHztnXmDR5zls+9dCeAZg==" />
-                        </div>
-                        <ul class="mytab_list">
-                            <li><i class="tit">我的昵称</i><input name="txtNiceName" type="text" value="15171695474" maxlength="20" id="txtNiceName" class="s_input" placeholder="" /></li>
-                            <li><i class="tit">&nbsp;</i>用户名只能包括汉字、英文字母、数字和下划线</li>
-                            <li><i class="tit">&nbsp;</i><input type="button" onclick="updateName()" name="btn" value="修改" id="btn" class="s_btn btn_red" /></li>
-                            <li><i class="tit">&nbsp;</i><span id="LabErr"></span></li>
-                        </ul>
+                        <input type="hidden" name="__VIEWSTATEGENERATOR" id="__VIEWSTATEGENERATOR" value="6C876674"/>
+                        <input type="hidden" name="__EVENTVALIDATION" id="__EVENTVALIDATION"
+                               value="/wEdAAO8SPdUDpH0Q7nHjeqbvI7ld2C+OxfjpZOniBJbql7XdnRgTJ25FWigbeFr84Vgoxdi/cg2vS37N0KER6F1nyr1wKHztnXmDR5zls+9dCeAZg=="/>
+                    </div>
+                    <ul class="mytab_list">
+                        <li><i class="tit">我的昵称</i><input name="txtNiceName" type="text" value="15171695474"
+                                                          maxlength="20" id="txtNiceName" class="s_input"
+                                                          placeholder=""/></li>
+                        <li><i class="tit">&nbsp;</i>用户名只能包括汉字、英文字母、数字和下划线</li>
+                        <li><i class="tit">&nbsp;</i><input type="button" onclick="updateName()" name="btn" value="修改"
+                                                            id="btn" class="s_btn btn_red"/></li>
+                        <li><i class="tit">&nbsp;</i><span id="LabErr"></span></li>
+                    </ul>
                </div>
            </div>
        </div>
@ -57,14 +63,13 @@
        dataType: "json",
        success: function (data) {
            if (data.code == 200) {
-                if(data.data.nickName){
+                if (data.data.nickName) {
                    $("#txtNiceName").val(data.data.nickName);
-                }else{
+                } else {
                    $("#txtNiceName").val(data.data.username);
                }


-
            } else if (data.code == 1001) {
                //未登录
                location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
@ -78,23 +83,26 @@
            layer.alert('网络异常');
        }
    })
+
    function updateName() {
        var nickname = $("#txtNiceName").val();
-        if(nickname.isBlank()){
+        if (nickname.isBlank()) {
            $("#LabErr").html("昵称不能为空！");
            return;
        }
-        if(!nickname.isNickName()){
+        if (!nickname.isNickName()) {
            $("#LabErr").html("昵称格式不正确！");
            return;
        }
        $.ajax({
            type: "POST",
            url: "/user/updateUserInfo",
-            data: {'nickName':nickname},
+            data: {'nickName': nickname},
            dataType: "json",
            success: function (data) {
                if (data.code == 200) {
+
+                    $.cookie('Authorization', data.data.token, {path: '/'});
                    window.location.href = '/user/setup.html';

                } else if (data.code == 1001) {
--- a/novel-front/src/main/resources/templates/user/set_sex.html
+++ b/novel-front/src/main/resources/templates/user/set_sex.html
@ -59,7 +59,7 @@
        dataType: "json",
        success: function (data) {
            if (data.code == 200) {
-                if(data.data.userSex === 0){
+                if(data.data.userSex === '0'){
                    $("input[name=sex]").eq(0).attr("checked",true);
                }

--- a/novel-front/src/main/resources/templates/user/setup.html
+++ b/novel-front/src/main/resources/templates/user/setup.html
@ -59,9 +59,9 @@
                }else{
                    $("#my_name").html(data.data.username+"<em class=\"ml10\">[修改]</em>");
                }
-                if(data.data.userSex === 0){
+                if(data.data.userSex === '0'){
                    $("#my_sex").html("男<em class=\"ml10\">[修改]</em>");
-                }else if(data.data.userSex === 1){
+                }else if(data.data.userSex === '1'){
                    $("#my_sex").html("女<em class=\"ml10\">[修改]</em>");
                }else{
                    $("#my_sex").html("请选择");
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@

    <groupId>com.java2nb</groupId>
    <artifactId>novel</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.2</version>
    <modules>
        <module>novel-common</module>
        <module>novel-front</module>
@ -36,6 +36,8 @@
        <orderbyhelper.version>1.0.2</orderbyhelper.version>
        <commons-lang3.version>3.4</commons-lang3.version>
        <jjwt.version>0.9.0</jjwt.version>
+        <elasticsearch.version>6.2.2</elasticsearch.version>
+        <jest.version>6.3.1</jest.version>
    </properties>

    <dependencyManagement>
--- a/sql/20200513.sql
+++ b/sql/20200513.sql
--- a/sql/20200518.sql
+++ b/sql/20200518.sql
@ -0,0 +1,3 @@
+INSERT INTO `crawl_source` (`id`, `source_name`, `crawl_rule`, `source_status`, `create_time`, `update_time`) VALUES ('4', '书趣阁', '{\r\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\r\n	\"catIdRule\": {\r\n		\"catId1\": \"1\",\r\n		\"catId2\": \"2\",\r\n		\"catId3\": \"3\",\r\n		\"catId4\": \"4\",\r\n		\"catId5\": \"7\",\r\n		\"catId6\": \"6\",\r\n		\"catId7\": \"8\"\r\n	},\r\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\r\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\r\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\r\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\r\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\r\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\r\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\r\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\r\n	\"bookStatusRule\": {\r\n		\"连载中\": 0,\r\n		\"完本\": 1\r\n	},\r\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\r\n	\"descEnd\": \"最新章节推荐地址\",\r\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\r\n	\"bookIndexStart\": \"》正文\",\r\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\r\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\r\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\r\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\r\n	\"contentEnd\": \"http://www.shuquge.com\"\r\n}', '1', '2020-05-18 12:02:34', '2020-05-18 12:02:34');
+INSERT INTO `crawl_source` (`id`, `source_name`, `crawl_rule`, `source_status`, `create_time`, `update_time`) VALUES ('5', '笔趣阁', '{\"bookListUrl\":\"http://m.mcmssc.com/xclass/{catId}/{page}.html\",\"catIdRule\":{\"catId1\":\"1\",\"catId2\":\"2\",\"catId3\":\"3\",\"catId4\":\"4\",\"catId5\":\"5\",\"catId6\":\"6\",\"catId7\":\"7\"},\"bookIdPatten\":\"href=\\\"/(\\\\d+_\\\\d+)/\\\"\",\"pagePatten\":\"class=\\\"page_txt\\\"\\\\s+value=\\\"(\\\\d+)/\\\\d+\\\"\\\\s+size=\",\"totalPagePatten\":\"class=\\\"page_txt\\\"\\\\s+value=\\\"\\\\d+/(\\\\d+)\\\"\\\\s+size=\",\"bookDetailUrl\":\"http://m.mcmssc.com/{bookId}/\",\"bookNamePatten\":\"<span\\\\s+class=\\\"title\\\">([^/]+)</span>\",\"authorNamePatten\":\"<a\\\\s+href=\\\"/author/\\\\d+/\\\">([^/]+)</a>\",\"picUrlPatten\":\"<img\\\\s+src=\\\"([^>]+)\\\"\\\\s+onerror=\",\"picUrlPrefix\":\"http://m.mcmssc.com/\",\"statusPatten\":\">状态：([^/]+)<\",\"bookStatusRule\":{\"连载\":0,\"全本\":1},\"visitCountPatten\":\">点击：(\\\\d+)<\",\"descStart\":\"<p class=\\\"review\\\">\",\"descEnd\":\"</p>\",\"bookIndexUrl\":\"http://m.mcmssc.com/{bookId}/all.html\",\"indexIdPatten\":\"<a\\\\s+href=\\\"/\\\\d+_\\\\d+/(\\\\d+)\\\\.html\\\">[^/]+</a>\",\"indexNamePatten\":\"<a\\\\s+href=\\\"/\\\\d+_\\\\d+/\\\\d+\\\\.html\\\">([^/]+)</a>\",\"bookContentUrl\":\"http://www.mcmssc.com/{bookId}/{indexId}.html\",\"contentStart\":\"</p>\",\"contentEnd\":\"<div align=\\\"center\\\">\"}', '1', '2020-05-18 15:57:41', '2020-05-18 15:57:41');
+UPDATE `crawl_source` SET `source_name` = '书趣阁', `crawl_rule` = '{\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"7\",\n		\"catId6\": \"6\",\n		\"catId7\": \"8\"\n	},\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\n	\"bookStatusRule\": {\n		\"连载中\": 0,\n		\"完本\": 1\n	},\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\n	\"descEnd\": \"最新章节推荐地址\",\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\n	\"bookIndexStart\": \"<dt>《\",\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\n	\"contentEnd\": \"http://www.shuquge.com\"\n}', `source_status` = 1, `create_time` = '2020-05-18 12:02:34', `update_time` = '2020-05-18 12:02:34' WHERE `id` = 4;
--- a/sql/novel_plus.sql
+++ b/sql/novel_plus.sql
@ -2,19 +2,65 @@
 Navicat MySQL Data Transfer

 Source Server         : localhost
-Source Server Version : 50624
+Source Server Version : 50725
 Source Host           : localhost:3306
-Source Database       : novel_biz
+Source Database       : novel_plus

 Target Server Type    : MYSQL
-Target Server Version : 50624
+Target Server Version : 50725
 File Encoding         : 65001

-Date: 2020-05-02 10:53:04
+Date: 2020-05-18 13:59:04
 */

 SET FOREIGN_KEY_CHECKS=0;

+-- ----------------------------
+-- Table structure for author
+-- ----------------------------
+DROP TABLE IF EXISTS `author`;
+CREATE TABLE `author` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
+  `invite_code` varchar(20) DEFAULT NULL COMMENT '邀请码',
+  `pen_name` varchar(20) DEFAULT NULL COMMENT '笔名',
+  `tel_phone` varchar(20) DEFAULT NULL COMMENT '手机号码',
+  `chat_account` varchar(50) DEFAULT NULL COMMENT 'QQ或微信账号',
+  `email` varchar(50) DEFAULT NULL COMMENT '电子邮箱',
+  `work_direction` tinyint(4) DEFAULT NULL COMMENT '作品方向，0：男频，1：女频',
+  `status` tinyint(4) DEFAULT '0' COMMENT '0：正常，1：封禁',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='作者表';
+
+-- ----------------------------
+-- Records of author
+-- ----------------------------
+INSERT INTO `author` VALUES ('1', null, 'reerer', 'abc', '13560487656', '23484388', '23484388@qq.com', '0', '0', null);
+INSERT INTO `author` VALUES ('2', '1255060328322027520', 'rwrr445554', '梦入神机', '13560421324', '1179705413', 'reerer@qq.com', '0', '0', '2020-05-13 14:01:31');
+
+-- ----------------------------
+-- Table structure for author_code
+-- ----------------------------
+DROP TABLE IF EXISTS `author_code`;
+CREATE TABLE `author_code` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `invite_code` varchar(100) DEFAULT NULL COMMENT '邀请码',
+  `validity_time` datetime DEFAULT NULL COMMENT '有效时间',
+  `is_use` tinyint(1) DEFAULT '0' COMMENT '是否使用过，0：未使用，1:使用过',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建人ID',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_code` (`invite_code`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='作家邀请码表';
+
+-- ----------------------------
+-- Records of author_code
+-- ----------------------------
+INSERT INTO `author_code` VALUES ('3', 'reerer', '2020-05-27 22:43:45', '1', '2020-05-13 11:40:56', '1');
+INSERT INTO `author_code` VALUES ('4', '123456', '2020-05-28 00:00:00', '0', '2020-05-13 14:09:55', '1');
+INSERT INTO `author_code` VALUES ('5', 'ww34343', '2020-05-21 00:00:00', '0', '2020-05-13 14:18:58', '1');
+
 -- ----------------------------
 -- Table structure for book
 -- ----------------------------
@ -49,7 +95,7 @@ CREATE TABLE `book` (
  UNIQUE KEY `key_uq_bookName_authorName` (`book_name`,`author_name`) USING BTREE,
  KEY `key_lastIndexUpdateTime` (`last_index_update_time`) USING BTREE,
  KEY `key_createTime` (`create_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1256127379949019137 DEFAULT CHARSET=utf8mb4 COMMENT='小说表';
+) ENGINE=InnoDB AUTO_INCREMENT=1262260513468559361 DEFAULT CHARSET=utf8mb4 COMMENT='小说表';

 -- ----------------------------
 -- Records of book
@ -156,7 +202,7 @@ CREATE TABLE `book_content` (
  `content` mediumtext COMMENT '小说章节内容',
  PRIMARY KEY (`id`),
  UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3342428 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE=InnoDB AUTO_INCREMENT=3347665 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';

 -- ----------------------------
 -- Records of book_content
@ -179,7 +225,7 @@ CREATE TABLE `book_index` (
  UNIQUE KEY `key_uq_bookId_indexNum` (`book_id`,`index_num`) USING BTREE,
  KEY `key_bookId` (`book_id`) USING BTREE,
  KEY `key_indexNum` (`index_num`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1256373101432717313 DEFAULT CHARSET=utf8mb4 COMMENT='小说目录表';
+) ENGINE=InnoDB AUTO_INCREMENT=1262260612777095169 DEFAULT CHARSET=utf8mb4 COMMENT='小说目录表';

 -- ----------------------------
 -- Records of book_index
@ -303,13 +349,15 @@ CREATE TABLE `crawl_source` (
  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='爬虫源表';
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='爬虫源表';

 -- ----------------------------
 -- Records of crawl_source
 -- ----------------------------
 INSERT INTO `crawl_source` VALUES ('2', '百书斋', '{\r\n	\"bookListUrl\": \"https://m.baishuzhai.com/blhb/{catId}/{page}.html\",\r\n	\"catIdRule\": {\r\n		\"catId1\": \"1\",\r\n		\"catId2\": \"2\",\r\n		\"catId3\": \"3\",\r\n		\"catId4\": \"4\",\r\n		\"catId5\": \"5\",\r\n		\"catId6\": \"6\",\r\n		\"catId7\": \"7\"\r\n	},\r\n	\"bookIdPatten\": \"href=\\\"/ibook/(\\\\d+/\\\\d+)/\\\"\",\r\n	\"pagePatten\": \"value=\\\"(\\\\d+)/\\\\d+\\\"\",\r\n	\"totalPagePatten\": \"value=\\\"\\\\d+/(\\\\d+)\\\"\",\r\n	\"bookDetailUrl\": \"https://m.baishuzhai.com/ibook/{bookId}/\",\r\n	\"bookNamePatten\": \"<span class=\\\"title\\\">([^/]+)</span>\",\r\n	\"authorNamePatten\": \">作者：([^/]+)<\",\r\n	\"picUrlPatten\": \"<img src=\\\"([^>]+)\\\"\\\\s+onerror=\\\"this.src=\",\r\n	\"statusPatten\": \"状态：([^/]+)</li>\",\r\n	\"bookStatusRule\": {\r\n		\"连载\": 0,\r\n		\"完成\": 1\r\n	},\r\n	\"scorePatten\": \"<em>([^<]+)</em>\",\r\n	\"descStart\": \"<p class=\\\"review\\\">\",\r\n	\"descEnd\": \"</p>\",\r\n	\"upadateTimePatten\": \"更新：(\\\\d+-\\\\d+-\\\\d+)</li>\",\r\n	\"upadateTimeFormatPatten\": \"yy-MM-dd\",\r\n	\"bookIndexUrl\": \"https://m.baishuzhai.com/ibook/{bookId}/all.html\",\r\n	\"indexIdPatten\": \"<a\\\\s+style=\\\"\\\"\\\\s+href=\\\"/ibook/\\\\d+/\\\\d+/(\\\\d+)\\\\.html\\\">[^/]+</a>\",\r\n	\"indexNamePatten\": \"<a\\\\s+style=\\\"\\\"\\\\s+href=\\\"/ibook/\\\\d+/\\\\d+/\\\\d+\\\\.html\\\">([^/]+)</a>\",\r\n	\"bookContentUrl\": \"https://baishuzhai.com/ibook/{bookId}/{indexId}.html\",\r\n	\"contentStart\": \"id=\\\"content\\\">\",\r\n	\"contentEnd\": \"<script>\"\r\n}', '0', '2020-05-01 14:22:50', '2020-05-01 14:22:50');
 INSERT INTO `crawl_source` VALUES ('3', '书包网', '{\r\n	\"bookListUrl\": \"https://www.bookbao8.com/booklist-p_{page}-c_{catId}-t_0-o_0.html\",\r\n	\"catIdRule\": {\r\n		\"catId1\": \"5\",\r\n		\"catId2\": \"4\",\r\n		\"catId3\": \"8\",\r\n		\"catId4\": \"9\",\r\n		\"catId5\": \"3\",\r\n		\"catId6\": \"7\"\r\n	},\r\n	\"bookIdPatten\": \"href=\\\"/book/(\\\\d+/\\\\d+/id_[^.]+).html\\\"\",\r\n	\"pagePatten\": \"<span\\\\s+class=\\\"current\\\">([^<]+)</span>\",\r\n	\"totalPagePatten\": \"/共(\\\\d+)页\",\r\n	\"bookDetailUrl\": \"https://www.bookbao8.com/book/{bookId}.html\",\r\n	\"bookNamePatten\": \"<div\\\\s+id=\\\"info\\\">\\\\s*<h1>([^<]+)</h1>\",\r\n	\"authorNamePatten\": \"<p>作者：<a\\\\s+href=\\\"/Search/[^\\\"]+\\\"\\\\s+target=\\\"_blank\\\">([^<]+)</a></p>\",\r\n	\"picUrlPatten\": \"<div\\\\s+id=\\\"fmimg\\\">\\\\s*<img\\\\s+alt=\\\"[^\\\"]+\\\"\\\\s+src=\\\"([^\\\"]+)\\\"\",\r\n	\"statusPatten\": \"<p>状态：([^<]+)</p>\",\r\n	\"bookStatusRule\": {\r\n		\"连载中\": 0,\r\n		\"已完结\": 1\r\n	},\r\n	\"visitCountPatten\": \"<em\\\\s+id=\\\"hits\\\">(\\\\d+)</em>\",\r\n	\"descStart\": \"<div class=\\\"infocontent\\\">\",\r\n	\"descEnd\": \"</div>\",\r\n	\"upadateTimePatten\": \"<p>更新时间：(\\\\d+-\\\\d+-\\\\d+\\\\s\\\\d+:\\\\d+:\\\\d+)</p>\",\r\n	\"upadateTimeFormatPatten\": \"yyyy-MM-dd HH:mm:ss\",\r\n	\"bookIndexUrl\": \"https://www.bookbao8.com/book/{bookId}.html\",\r\n	\"indexIdPatten\": \"<li>\\\\s*<a\\\\s+href=\\\"/views/\\\\d+/\\\\d+/id_[^_]+_(\\\\d+).html\\\"\\\\s+target=\\\"_blank\\\">\",\r\n	\"indexNamePatten\": \"<li>\\\\s*<a\\\\s+href=\\\"/views/\\\\d+/\\\\d+/id_[^_]+_\\\\d+.html\\\"\\\\s+target=\\\"_blank\\\">([^<]+)</a>\",\r\n	\"bookContentUrl\": \"https://www.bookbao8.com/views/{bookId}_{indexId}.html\",\r\n	\"contentStart\": \"<dd id=\\\"contents\\\">\",\r\n	\"contentEnd\": \"</dd>\"\r\n}', '0', '2020-05-04 17:42:22', '2020-05-04 17:42:22');
+INSERT INTO `crawl_source` VALUES ('4', '书趣阁', '{\r\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\r\n	\"catIdRule\": {\r\n		\"catId1\": \"1\",\r\n		\"catId2\": \"2\",\r\n		\"catId3\": \"3\",\r\n		\"catId4\": \"4\",\r\n		\"catId5\": \"7\",\r\n		\"catId6\": \"6\",\r\n		\"catId7\": \"8\"\r\n	},\r\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\r\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\r\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\r\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\r\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\r\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\r\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\r\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\r\n	\"bookStatusRule\": {\r\n		\"连载中\": 0,\r\n		\"完本\": 1\r\n	},\r\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\r\n	\"descEnd\": \"最新章节推荐地址\",\r\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\r\n	\"bookIndexStart\": \"》正文\",\r\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\r\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\r\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\r\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\r\n	\"contentEnd\": \"http://www.shuquge.com\"\r\n}', '1', '2020-05-18 12:02:34', '2020-05-18 12:02:34');
+INSERT INTO `crawl_source` (`id`, `source_name`, `crawl_rule`, `source_status`, `create_time`, `update_time`) VALUES ('5', '笔趣阁', '{\"bookListUrl\":\"http://m.mcmssc.com/xclass/{catId}/{page}.html\",\"catIdRule\":{\"catId1\":\"1\",\"catId2\":\"2\",\"catId3\":\"3\",\"catId4\":\"4\",\"catId5\":\"5\",\"catId6\":\"6\",\"catId7\":\"7\"},\"bookIdPatten\":\"href=\\\"/(\\\\d+_\\\\d+)/\\\"\",\"pagePatten\":\"class=\\\"page_txt\\\"\\\\s+value=\\\"(\\\\d+)/\\\\d+\\\"\\\\s+size=\",\"totalPagePatten\":\"class=\\\"page_txt\\\"\\\\s+value=\\\"\\\\d+/(\\\\d+)\\\"\\\\s+size=\",\"bookDetailUrl\":\"http://m.mcmssc.com/{bookId}/\",\"bookNamePatten\":\"<span\\\\s+class=\\\"title\\\">([^/]+)</span>\",\"authorNamePatten\":\"<a\\\\s+href=\\\"/author/\\\\d+/\\\">([^/]+)</a>\",\"picUrlPatten\":\"<img\\\\s+src=\\\"([^>]+)\\\"\\\\s+onerror=\",\"picUrlPrefix\":\"http://m.mcmssc.com/\",\"statusPatten\":\">状态：([^/]+)<\",\"bookStatusRule\":{\"连载\":0,\"全本\":1},\"visitCountPatten\":\">点击：(\\\\d+)<\",\"descStart\":\"<p class=\\\"review\\\">\",\"descEnd\":\"</p>\",\"bookIndexUrl\":\"http://m.mcmssc.com/{bookId}/all.html\",\"indexIdPatten\":\"<a\\\\s+href=\\\"/\\\\d+_\\\\d+/(\\\\d+)\\\\.html\\\">[^/]+</a>\",\"indexNamePatten\":\"<a\\\\s+href=\\\"/\\\\d+_\\\\d+/\\\\d+\\\\.html\\\">([^/]+)</a>\",\"bookContentUrl\":\"http://www.mcmssc.com/{bookId}/{indexId}.html\",\"contentStart\":\"</p>\",\"contentEnd\":\"<div align=\\\"center\\\">\"}', '1', '2020-05-18 15:57:41', '2020-05-18 15:57:41');

 -- ----------------------------
 -- Table structure for friend_link
@ -378,6 +426,27 @@ CREATE TABLE `news_category` (
 INSERT INTO `news_category` VALUES ('1', '招募', '10', null, null, null, null);
 INSERT INTO `news_category` VALUES ('3', '公告', '11', null, null, null, null);

+-- ----------------------------
+-- Table structure for order_pay
+-- ----------------------------
+DROP TABLE IF EXISTS `order_pay`;
+CREATE TABLE `order_pay` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `out_trade_no` bigint(20) NOT NULL COMMENT '商户订单号',
+  `trade_no` varchar(64) DEFAULT NULL COMMENT '支付宝/微信交易号',
+  `pay_channel` tinyint(1) NOT NULL DEFAULT '1' COMMENT '支付渠道，1：支付宝，2：微信',
+  `total_amount` int(11) NOT NULL COMMENT '交易金额(单位元)',
+  `user_id` bigint(20) NOT NULL COMMENT '支付用户ID',
+  `pay_status` tinyint(1) DEFAULT '2' COMMENT '支付状态：0：支付失败，1：支付成功，2：待支付',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COMMENT='充值订单';
+
+-- ----------------------------
+-- Records of order_pay
+-- ----------------------------
+
 -- ----------------------------
 -- Table structure for sys_data_perm
 -- ----------------------------
@ -456,7 +525,7 @@ CREATE TABLE `sys_dict` (
  KEY `sys_dict_value` (`value`),
  KEY `sys_dict_label` (`name`),
  KEY `sys_dict_del_flag` (`del_flag`)
-) ENGINE=InnoDB AUTO_INCREMENT=140 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=142 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='字典表';

 -- ----------------------------
 -- Records of sys_dict
@ -589,6 +658,8 @@ INSERT INTO `sys_dict` VALUES ('136', '富文本', '6', 'page_type', '页面显
 INSERT INTO `sys_dict` VALUES ('137', '上传图片【单文件】', '7', 'page_type', '页面显示类型', '7', null, null, null, null, null, '', null);
 INSERT INTO `sys_dict` VALUES ('138', '隐藏域', '11', 'page_type', '页面显示类型', '11', null, null, null, null, null, '', null);
 INSERT INTO `sys_dict` VALUES ('139', '不显示', '12', 'page_type', '页面显示类型', '12', null, null, null, null, null, '', null);
+INSERT INTO `sys_dict` VALUES ('140', '男频', '0', 'work_direction', '作品方向', '0', null, null, null, null, null, '', null);
+INSERT INTO `sys_dict` VALUES ('141', '女频', '1', 'work_direction', '作品方向', '1', null, null, null, null, null, '', null);

 -- ----------------------------
 -- Table structure for sys_file
@ -664,7 +735,7 @@ CREATE TABLE `sys_gen_columns` (
  `is_required` tinyint(1) DEFAULT NULL COMMENT '是否必填',
  `dict_type` varchar(100) CHARACTER SET utf8 DEFAULT '' COMMENT '页面显示为下拉时使用，字典类型从字典表中取出',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=801 DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB AUTO_INCREMENT=815 DEFAULT CHARSET=utf8mb4;

 -- ----------------------------
 -- Records of sys_gen_columns
@ -728,6 +799,20 @@ INSERT INTO `sys_gen_columns` VALUES ('797', 'fb_order', 'push_time', 'datetime'
 INSERT INTO `sys_gen_columns` VALUES ('798', 'fb_order', 'push_ip', 'varchar', 'String', '推送IP', '31', '推送IP', '6', '0', 'del_flag');
 INSERT INTO `sys_gen_columns` VALUES ('799', 'fb_order', 'mcht_id', 'bigint', 'BigDecimal', '商户id', '90', '商户id', '3', '0', 'theme');
 INSERT INTO `sys_gen_columns` VALUES ('800', 'fb_order', 'sn', 'char', 'String', 'QR编号', '100', 'QR编号', '1', '0', 'del_flag');
+INSERT INTO `sys_gen_columns` VALUES ('801', 'author', 'user_id', 'bigint', 'Long', '用户ID', '2', '用户ID', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('802', 'author', 'invite_code', 'varchar', 'String', '邀请码', '3', '邀请码', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('803', 'author', 'pen_name', 'varchar', 'String', '笔名', '4', '笔名', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('804', 'author', 'tel_phone', 'varchar', 'String', '手机号码', '5', '手机号码', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('805', 'author', 'chat_account', 'varchar', 'String', 'QQ或微信账号', '6', 'QQ或微信账号', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('806', 'author', 'email', 'varchar', 'String', '电子邮箱', '7', '电子邮箱', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('807', 'author', 'work_direction', 'tinyint', 'Integer', '作品方向，0：男频，1：女频', '8', '作品方向，0：男频，1：女频', '2', '0', 'work_direction');
+INSERT INTO `sys_gen_columns` VALUES ('808', 'author', 'status', 'tinyint', 'Integer', '0：正常，1：封禁', '10', '0：正常，1：封禁', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('809', 'author', 'create_time', 'datetime', 'Date', '创建时间', '9', '入驻时间', '4', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('810', 'author_code', 'invite_code', 'varchar', 'String', '邀请码', '2', '邀请码', '1', '1', null);
+INSERT INTO `sys_gen_columns` VALUES ('811', 'author_code', 'validity_time', 'datetime', 'Date', '有效时间', '3', '有效时间', '4', '1', null);
+INSERT INTO `sys_gen_columns` VALUES ('812', 'author_code', 'is_use', 'tinyint', 'Integer', '是否使用过，0：未使用，1:使用过', '4', '是否使用过，0：未使用，1:使用过', '1', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('813', 'author_code', 'create_time', 'datetime', 'Date', '创建时间', '5', '创建时间', '4', '0', null);
+INSERT INTO `sys_gen_columns` VALUES ('814', 'author_code', 'create_user_id', 'bigint', 'Long', '创建人ID', '6', '创建人ID', '1', '0', null);

 -- ----------------------------
 -- Table structure for sys_gen_table
@ -807,11 +892,54 @@ CREATE TABLE `sys_log` (
  `ip` varchar(64) DEFAULT NULL COMMENT 'IP地址',
  `gmt_create` datetime DEFAULT NULL COMMENT '创建时间',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1369 DEFAULT CHARSET=utf8 COMMENT='系统日志';
+) ENGINE=InnoDB AUTO_INCREMENT=1412 DEFAULT CHARSET=utf8 COMMENT='系统日志';

 -- ----------------------------
 -- Records of sys_log
 -- ----------------------------
+INSERT INTO `sys_log` VALUES ('1369', '-1', '获取用户信息为空', '登录', '462', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:21');
+INSERT INTO `sys_log` VALUES ('1370', '-1', '获取用户信息为空', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:26');
+INSERT INTO `sys_log` VALUES ('1371', '1', 'admin', '登录', '98', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:33');
+INSERT INTO `sys_log` VALUES ('1372', '1', 'admin', '请求访问主页', '372', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:09:33');
+INSERT INTO `sys_log` VALUES ('1373', '1', 'admin', '请求访问主页', '28', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:12:41');
+INSERT INTO `sys_log` VALUES ('1374', '1', 'admin', '编辑角色', '11', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:18:42');
+INSERT INTO `sys_log` VALUES ('1375', '1', 'admin', '添加菜单', '2', 'com.java2nb.system.controller.MenuController.add()', null, '127.0.0.1', '2020-05-13 11:19:55');
+INSERT INTO `sys_log` VALUES ('1376', '1', 'admin', '保存菜单', '225', 'com.java2nb.system.controller.MenuController.save()', null, '127.0.0.1', '2020-05-13 11:24:42');
+INSERT INTO `sys_log` VALUES ('1377', '1', 'admin', '编辑菜单', '15', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:54');
+INSERT INTO `sys_log` VALUES ('1378', '1', 'admin', '编辑菜单', '11', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:58');
+INSERT INTO `sys_log` VALUES ('1379', '1', 'admin', '更新菜单', '241', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:12');
+INSERT INTO `sys_log` VALUES ('1380', '1', 'admin', '编辑菜单', '8', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:25:16');
+INSERT INTO `sys_log` VALUES ('1381', '1', 'admin', '更新菜单', '199', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:26');
+INSERT INTO `sys_log` VALUES ('1382', '1', 'admin', '编辑角色', '13', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:26:11');
+INSERT INTO `sys_log` VALUES ('1383', '1', 'admin', '更新角色', '931', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:26:36');
+INSERT INTO `sys_log` VALUES ('1384', '-1', '获取用户信息为空', '登录', '11', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:02');
+INSERT INTO `sys_log` VALUES ('1385', '1', 'admin', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:08');
+INSERT INTO `sys_log` VALUES ('1386', '1', 'admin', '请求访问主页', '27', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:08');
+INSERT INTO `sys_log` VALUES ('1387', '1', 'admin', '登录', '272', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:56');
+INSERT INTO `sys_log` VALUES ('1388', '1', 'admin', '请求访问主页', '109', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:56');
+INSERT INTO `sys_log` VALUES ('1389', '1', 'admin', '编辑角色', '8', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:30:36');
+INSERT INTO `sys_log` VALUES ('1390', '1', 'admin', '更新角色', '567', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:30:42');
+INSERT INTO `sys_log` VALUES ('1391', '-1', '获取用户信息为空', '登录', '246', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:38');
+INSERT INTO `sys_log` VALUES ('1392', '1', 'admin', '登录', '38', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:42');
+INSERT INTO `sys_log` VALUES ('1393', '1', 'admin', '请求访问主页', '110', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:31:43');
+INSERT INTO `sys_log` VALUES ('1394', '1', 'admin', 'error', null, 'http://127.0.0.1/test/order/list', 'org.springframework.jdbc.BadSqlGrammarException: \r\n### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\r\n### The error may exist in file [E:\\baseprojectparent\\novel-plus\\novel-admin\\target\\classes\\mybatis\\test\\OrderMapper.xml]\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order                                      order by id desc             limit ?, ?\r\n### Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist', null, '2020-05-13 11:33:27');
+INSERT INTO `sys_log` VALUES ('1395', '1', 'admin', '登录', '276', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:39:20');
+INSERT INTO `sys_log` VALUES ('1396', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:39:20');
+INSERT INTO `sys_log` VALUES ('1397', '1', 'admin', '登录', '285', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:47:00');
+INSERT INTO `sys_log` VALUES ('1398', '1', 'admin', '请求访问主页', '90', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:47:00');
+INSERT INTO `sys_log` VALUES ('1399', '1', 'admin', '登录', '251', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:48:28');
+INSERT INTO `sys_log` VALUES ('1400', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:48:28');
+INSERT INTO `sys_log` VALUES ('1401', '1', 'admin', '登录', '302', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:09:33');
+INSERT INTO `sys_log` VALUES ('1402', '1', 'admin', '请求访问主页', '88', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:09:34');
+INSERT INTO `sys_log` VALUES ('1403', '1', 'admin', '请求更改用户密码', '3', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:11:49');
+INSERT INTO `sys_log` VALUES ('1404', '1', 'admin', 'admin提交更改用户密码', '140', 'com.java2nb.system.controller.UserController.adminResetPwd()', null, '127.0.0.1', '2020-05-13 14:11:50');
+INSERT INTO `sys_log` VALUES ('1405', '1', 'admin', '请求更改用户密码', '4', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:12:11');
+INSERT INTO `sys_log` VALUES ('1406', '1', 'admin', '登录', '275', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:14:26');
+INSERT INTO `sys_log` VALUES ('1407', '1', 'admin', '请求访问主页', '73', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:14:27');
+INSERT INTO `sys_log` VALUES ('1408', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:38');
+INSERT INTO `sys_log` VALUES ('1409', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:47');
+INSERT INTO `sys_log` VALUES ('1410', '1', 'admin', '登录', '261', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:18:07');
+INSERT INTO `sys_log` VALUES ('1411', '1', 'admin', '请求访问主页', '83', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:18:07');

 -- ----------------------------
 -- Table structure for sys_menu
@ -829,7 +957,7 @@ CREATE TABLE `sys_menu` (
  `gmt_create` datetime DEFAULT NULL COMMENT '创建时间',
  `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间',
  PRIMARY KEY (`menu_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=215 DEFAULT CHARSET=utf8 COMMENT='菜单管理';
+) ENGINE=InnoDB AUTO_INCREMENT=234 DEFAULT CHARSET=utf8 COMMENT='菜单管理';

 -- ----------------------------
 -- Records of sys_menu
@ -886,6 +1014,19 @@ INSERT INTO `sys_menu` VALUES ('211', '209', '新增', null, 'system:dataPerm:ad
 INSERT INTO `sys_menu` VALUES ('212', '209', '修改', null, 'system:dataPerm:edit', '2', null, '6', null, null);
 INSERT INTO `sys_menu` VALUES ('213', '209', '删除', null, 'system:dataPerm:remove', '2', null, '6', null, null);
 INSERT INTO `sys_menu` VALUES ('214', '209', '批量删除', null, 'system:dataPerm:batchRemove', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('221', '0', '作家管理', '', '', '0', 'fa fa-user-o', '10', null, null);
+INSERT INTO `sys_menu` VALUES ('222', '221', '作者列表', 'novel/author', 'novel:author:author', '1', 'fa', '6', null, null);
+INSERT INTO `sys_menu` VALUES ('223', '222', '查看', null, 'novel:author:detail', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('224', '222', '新增', null, 'novel:author:add', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('225', '222', '修改', null, 'novel:author:edit', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('226', '222', '删除', null, 'novel:author:remove', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('227', '222', '批量删除', null, 'novel:author:batchRemove', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('228', '221', '邀请码管理', 'novel/authorCode', 'novel:authorCode:authorCode', '1', 'fa', '3', null, null);
+INSERT INTO `sys_menu` VALUES ('229', '228', '查看', null, 'novel:authorCode:detail', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('230', '228', '新增', null, 'novel:authorCode:add', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('231', '228', '修改', null, 'novel:authorCode:edit', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('232', '228', '删除', null, 'novel:authorCode:remove', '2', null, '6', null, null);
+INSERT INTO `sys_menu` VALUES ('233', '228', '批量删除', null, 'novel:authorCode:batchRemove', '2', null, '6', null, null);

 -- ----------------------------
 -- Table structure for sys_role
@ -919,22 +1060,22 @@ CREATE TABLE `sys_role_data_perm` (
  `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
  `perm_id` bigint(20) DEFAULT NULL COMMENT '权限ID',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8 COMMENT='角色与数据权限对应关系';
+) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8 COMMENT='角色与数据权限对应关系';

 -- ----------------------------
 -- Records of sys_role_data_perm
 -- ----------------------------
-INSERT INTO `sys_role_data_perm` VALUES ('49', '1', '214');
-INSERT INTO `sys_role_data_perm` VALUES ('50', '1', '213');
-INSERT INTO `sys_role_data_perm` VALUES ('51', '1', '212');
-INSERT INTO `sys_role_data_perm` VALUES ('52', '1', '211');
-INSERT INTO `sys_role_data_perm` VALUES ('53', '1', '210');
-INSERT INTO `sys_role_data_perm` VALUES ('54', '1', '1199168630769283072');
-INSERT INTO `sys_role_data_perm` VALUES ('55', '1', '-1');
-INSERT INTO `sys_role_data_perm` VALUES ('56', '1', '1199168630454710272');
 INSERT INTO `sys_role_data_perm` VALUES ('60', '60', '211');
 INSERT INTO `sys_role_data_perm` VALUES ('61', '60', '-1');
 INSERT INTO `sys_role_data_perm` VALUES ('62', '60', '1199170283966787584');
+INSERT INTO `sys_role_data_perm` VALUES ('71', '1', '214');
+INSERT INTO `sys_role_data_perm` VALUES ('72', '1', '213');
+INSERT INTO `sys_role_data_perm` VALUES ('73', '1', '212');
+INSERT INTO `sys_role_data_perm` VALUES ('74', '1', '211');
+INSERT INTO `sys_role_data_perm` VALUES ('75', '1', '210');
+INSERT INTO `sys_role_data_perm` VALUES ('76', '1', '1260412100929482752');
+INSERT INTO `sys_role_data_perm` VALUES ('77', '1', '-1');
+INSERT INTO `sys_role_data_perm` VALUES ('78', '1', '1260412099998347264');

 -- ----------------------------
 -- Table structure for sys_role_menu
@ -945,7 +1086,7 @@ CREATE TABLE `sys_role_menu` (
  `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
  `menu_id` bigint(20) DEFAULT NULL COMMENT '菜单ID',
  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4704 DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系';
+) ENGINE=InnoDB AUTO_INCREMENT=4830 DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系';

 -- ----------------------------
 -- Records of sys_role_menu
@ -1166,59 +1307,6 @@ INSERT INTO `sys_role_menu` VALUES ('3280', '59', '3');
 INSERT INTO `sys_role_menu` VALUES ('3281', '59', '78');
 INSERT INTO `sys_role_menu` VALUES ('3282', '59', '1');
 INSERT INTO `sys_role_menu` VALUES ('3283', '59', '-1');
-INSERT INTO `sys_role_menu` VALUES ('4505', '1', '208');
-INSERT INTO `sys_role_menu` VALUES ('4506', '1', '207');
-INSERT INTO `sys_role_menu` VALUES ('4507', '1', '206');
-INSERT INTO `sys_role_menu` VALUES ('4508', '1', '205');
-INSERT INTO `sys_role_menu` VALUES ('4509', '1', '204');
-INSERT INTO `sys_role_menu` VALUES ('4510', '1', '92');
-INSERT INTO `sys_role_menu` VALUES ('4511', '1', '57');
-INSERT INTO `sys_role_menu` VALUES ('4512', '1', '30');
-INSERT INTO `sys_role_menu` VALUES ('4513', '1', '29');
-INSERT INTO `sys_role_menu` VALUES ('4514', '1', '28');
-INSERT INTO `sys_role_menu` VALUES ('4515', '1', '104');
-INSERT INTO `sys_role_menu` VALUES ('4516', '1', '48');
-INSERT INTO `sys_role_menu` VALUES ('4517', '1', '214');
-INSERT INTO `sys_role_menu` VALUES ('4518', '1', '213');
-INSERT INTO `sys_role_menu` VALUES ('4519', '1', '212');
-INSERT INTO `sys_role_menu` VALUES ('4520', '1', '211');
-INSERT INTO `sys_role_menu` VALUES ('4521', '1', '210');
-INSERT INTO `sys_role_menu` VALUES ('4522', '1', '76');
-INSERT INTO `sys_role_menu` VALUES ('4523', '1', '75');
-INSERT INTO `sys_role_menu` VALUES ('4524', '1', '74');
-INSERT INTO `sys_role_menu` VALUES ('4525', '1', '62');
-INSERT INTO `sys_role_menu` VALUES ('4526', '1', '56');
-INSERT INTO `sys_role_menu` VALUES ('4527', '1', '55');
-INSERT INTO `sys_role_menu` VALUES ('4528', '1', '15');
-INSERT INTO `sys_role_menu` VALUES ('4529', '1', '26');
-INSERT INTO `sys_role_menu` VALUES ('4530', '1', '25');
-INSERT INTO `sys_role_menu` VALUES ('4531', '1', '24');
-INSERT INTO `sys_role_menu` VALUES ('4532', '1', '14');
-INSERT INTO `sys_role_menu` VALUES ('4533', '1', '13');
-INSERT INTO `sys_role_menu` VALUES ('4534', '1', '12');
-INSERT INTO `sys_role_menu` VALUES ('4535', '1', '61');
-INSERT INTO `sys_role_menu` VALUES ('4536', '1', '22');
-INSERT INTO `sys_role_menu` VALUES ('4537', '1', '21');
-INSERT INTO `sys_role_menu` VALUES ('4538', '1', '20');
-INSERT INTO `sys_role_menu` VALUES ('4539', '1', '83');
-INSERT INTO `sys_role_menu` VALUES ('4540', '1', '81');
-INSERT INTO `sys_role_menu` VALUES ('4541', '1', '80');
-INSERT INTO `sys_role_menu` VALUES ('4542', '1', '79');
-INSERT INTO `sys_role_menu` VALUES ('4543', '1', '71');
-INSERT INTO `sys_role_menu` VALUES ('4544', '1', '203');
-INSERT INTO `sys_role_menu` VALUES ('4545', '1', '202');
-INSERT INTO `sys_role_menu` VALUES ('4546', '1', '27');
-INSERT INTO `sys_role_menu` VALUES ('4547', '1', '91');
-INSERT INTO `sys_role_menu` VALUES ('4548', '1', '77');
-INSERT INTO `sys_role_menu` VALUES ('4549', '1', '209');
-INSERT INTO `sys_role_menu` VALUES ('4550', '1', '73');
-INSERT INTO `sys_role_menu` VALUES ('4551', '1', '7');
-INSERT INTO `sys_role_menu` VALUES ('4552', '1', '6');
-INSERT INTO `sys_role_menu` VALUES ('4553', '1', '2');
-INSERT INTO `sys_role_menu` VALUES ('4554', '1', '3');
-INSERT INTO `sys_role_menu` VALUES ('4555', '1', '78');
-INSERT INTO `sys_role_menu` VALUES ('4556', '1', '1');
-INSERT INTO `sys_role_menu` VALUES ('4557', '1', '-1');
 INSERT INTO `sys_role_menu` VALUES ('4611', '61', '208');
 INSERT INTO `sys_role_menu` VALUES ('4612', '61', '207');
 INSERT INTO `sys_role_menu` VALUES ('4613', '61', '206');
@ -1312,6 +1400,72 @@ INSERT INTO `sys_role_menu` VALUES ('4700', '60', '78');
 INSERT INTO `sys_role_menu` VALUES ('4701', '60', '1');
 INSERT INTO `sys_role_menu` VALUES ('4702', '60', '-1');
 INSERT INTO `sys_role_menu` VALUES ('4703', '60', '3');
+INSERT INTO `sys_role_menu` VALUES ('4764', '1', '227');
+INSERT INTO `sys_role_menu` VALUES ('4765', '1', '226');
+INSERT INTO `sys_role_menu` VALUES ('4766', '1', '225');
+INSERT INTO `sys_role_menu` VALUES ('4767', '1', '224');
+INSERT INTO `sys_role_menu` VALUES ('4768', '1', '223');
+INSERT INTO `sys_role_menu` VALUES ('4769', '1', '208');
+INSERT INTO `sys_role_menu` VALUES ('4770', '1', '207');
+INSERT INTO `sys_role_menu` VALUES ('4771', '1', '206');
+INSERT INTO `sys_role_menu` VALUES ('4772', '1', '205');
+INSERT INTO `sys_role_menu` VALUES ('4773', '1', '204');
+INSERT INTO `sys_role_menu` VALUES ('4774', '1', '92');
+INSERT INTO `sys_role_menu` VALUES ('4775', '1', '57');
+INSERT INTO `sys_role_menu` VALUES ('4776', '1', '30');
+INSERT INTO `sys_role_menu` VALUES ('4777', '1', '29');
+INSERT INTO `sys_role_menu` VALUES ('4778', '1', '28');
+INSERT INTO `sys_role_menu` VALUES ('4779', '1', '104');
+INSERT INTO `sys_role_menu` VALUES ('4780', '1', '48');
+INSERT INTO `sys_role_menu` VALUES ('4781', '1', '214');
+INSERT INTO `sys_role_menu` VALUES ('4782', '1', '213');
+INSERT INTO `sys_role_menu` VALUES ('4783', '1', '212');
+INSERT INTO `sys_role_menu` VALUES ('4784', '1', '211');
+INSERT INTO `sys_role_menu` VALUES ('4785', '1', '210');
+INSERT INTO `sys_role_menu` VALUES ('4786', '1', '76');
+INSERT INTO `sys_role_menu` VALUES ('4787', '1', '75');
+INSERT INTO `sys_role_menu` VALUES ('4788', '1', '74');
+INSERT INTO `sys_role_menu` VALUES ('4789', '1', '62');
+INSERT INTO `sys_role_menu` VALUES ('4790', '1', '56');
+INSERT INTO `sys_role_menu` VALUES ('4791', '1', '55');
+INSERT INTO `sys_role_menu` VALUES ('4792', '1', '15');
+INSERT INTO `sys_role_menu` VALUES ('4793', '1', '26');
+INSERT INTO `sys_role_menu` VALUES ('4794', '1', '25');
+INSERT INTO `sys_role_menu` VALUES ('4795', '1', '24');
+INSERT INTO `sys_role_menu` VALUES ('4796', '1', '14');
+INSERT INTO `sys_role_menu` VALUES ('4797', '1', '13');
+INSERT INTO `sys_role_menu` VALUES ('4798', '1', '12');
+INSERT INTO `sys_role_menu` VALUES ('4799', '1', '61');
+INSERT INTO `sys_role_menu` VALUES ('4800', '1', '22');
+INSERT INTO `sys_role_menu` VALUES ('4801', '1', '21');
+INSERT INTO `sys_role_menu` VALUES ('4802', '1', '20');
+INSERT INTO `sys_role_menu` VALUES ('4803', '1', '83');
+INSERT INTO `sys_role_menu` VALUES ('4804', '1', '81');
+INSERT INTO `sys_role_menu` VALUES ('4805', '1', '80');
+INSERT INTO `sys_role_menu` VALUES ('4806', '1', '79');
+INSERT INTO `sys_role_menu` VALUES ('4807', '1', '71');
+INSERT INTO `sys_role_menu` VALUES ('4808', '1', '222');
+INSERT INTO `sys_role_menu` VALUES ('4809', '1', '203');
+INSERT INTO `sys_role_menu` VALUES ('4810', '1', '202');
+INSERT INTO `sys_role_menu` VALUES ('4811', '1', '27');
+INSERT INTO `sys_role_menu` VALUES ('4812', '1', '91');
+INSERT INTO `sys_role_menu` VALUES ('4813', '1', '77');
+INSERT INTO `sys_role_menu` VALUES ('4814', '1', '209');
+INSERT INTO `sys_role_menu` VALUES ('4815', '1', '73');
+INSERT INTO `sys_role_menu` VALUES ('4816', '1', '7');
+INSERT INTO `sys_role_menu` VALUES ('4817', '1', '6');
+INSERT INTO `sys_role_menu` VALUES ('4818', '1', '2');
+INSERT INTO `sys_role_menu` VALUES ('4819', '1', '3');
+INSERT INTO `sys_role_menu` VALUES ('4820', '1', '78');
+INSERT INTO `sys_role_menu` VALUES ('4821', '1', '1');
+INSERT INTO `sys_role_menu` VALUES ('4822', '1', '228');
+INSERT INTO `sys_role_menu` VALUES ('4823', '1', '233');
+INSERT INTO `sys_role_menu` VALUES ('4824', '1', '232');
+INSERT INTO `sys_role_menu` VALUES ('4825', '1', '231');
+INSERT INTO `sys_role_menu` VALUES ('4826', '1', '230');
+INSERT INTO `sys_role_menu` VALUES ('4827', '1', '229');
+INSERT INTO `sys_role_menu` VALUES ('4828', '1', '221');
+INSERT INTO `sys_role_menu` VALUES ('4829', '1', '-1');

 -- ----------------------------
 -- Table structure for sys_user
@ -1355,7 +1509,7 @@ INSERT INTO `sys_user` VALUES ('134', 'lyh', '李彦宏', 'dc26092b3244d9d432863
 INSERT INTO `sys_user` VALUES ('135', 'wjl', '王健林', '3967697dfced162cf6a34080259b83aa', '6', 'wjl@bootod.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
 INSERT INTO `sys_user` VALUES ('136', 'gdg', '郭德纲', '3bb1bda86bc02bf6478cd91e42135d2f', '9', 'gdg@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
 INSERT INTO `sys_user` VALUES ('137', 'test2', 'test2', '649169898e69272c0e5bc899baf1e904', null, '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('138', 'test3', 'test3', '4428f69c806f51128f3974f948a2f272', '16', '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO `sys_user` VALUES ('138', 'test3', 'test3', '79ba2d0b58d8a2e94f6b18744c8cd280', '16', '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);

 -- ----------------------------
 -- Table structure for sys_user_role
@ -1460,6 +1614,29 @@ INSERT INTO `user_bookshelf` VALUES ('39', '1255060328322027520', '1254681071191
 INSERT INTO `user_bookshelf` VALUES ('40', '1255060328322027520', '1254676970567565312', '3264258', '2020-04-30 09:57:18', '2020-04-30 19:19:11');
 INSERT INTO `user_bookshelf` VALUES ('41', '1255060328322027520', '1254675594315759616', '1254675594496114688', '2020-04-30 18:37:18', null);

+-- ----------------------------
+-- Table structure for user_buy_record
+-- ----------------------------
+DROP TABLE IF EXISTS `user_buy_record`;
+CREATE TABLE `user_buy_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `book_id` bigint(20) DEFAULT NULL COMMENT '购买的小说ID',
+  `book_name` varchar(50) DEFAULT NULL COMMENT '购买的小说名',
+  `book_index_id` bigint(20) DEFAULT NULL COMMENT '购买的章节ID',
+  `book_index_name` varchar(100) DEFAULT NULL COMMENT '购买的章节名',
+  `buy_amount` int(11) DEFAULT NULL COMMENT '购买使用的屋币数量',
+  `create_time` datetime DEFAULT NULL COMMENT '购买时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_userId_indexId` (`user_id`,`book_index_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='用户消费记录表';
+
+-- ----------------------------
+-- Records of user_buy_record
+-- ----------------------------
+INSERT INTO `user_buy_record` VALUES ('1', '1255060328322027520', '1260400284744613890', '我是一只消消乐2', '1260522024606953472', '第三章', '10', '2020-05-13 21:29:09');
+INSERT INTO `user_buy_record` VALUES ('2', '1255060328322027520', '1260400284744613890', '我是一只消消乐2', '1260564410687107072', '第四章', '10', '2020-05-13 21:40:38');
+
 -- ----------------------------
 -- Table structure for user_feedback
 -- ----------------------------
@ -1513,3 +1690,5 @@ INSERT INTO `user_read_history` VALUES ('111', '1255060328322027520', '125495762
 INSERT INTO `user_read_history` VALUES ('113', '1255060328322027520', '1254676970567565312', '3264258', '2020-04-30 19:19:11', '2020-04-30 19:19:11');
 INSERT INTO `user_read_history` VALUES ('117', '1255060328322027520', '1254946661743603712', '1254946914001629184', '2020-04-30 19:37:09', '2020-04-30 19:37:09');
 INSERT INTO `user_read_history` VALUES ('118', '1255060328322027520', '1254957312633352192', '3335449', '2020-04-30 19:37:36', '2020-04-30 19:37:36');
+
+UPDATE `crawl_source` SET `source_name` = '书趣阁', `crawl_rule` = '{\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"7\",\n		\"catId6\": \"6\",\n		\"catId7\": \"8\"\n	},\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\n	\"bookStatusRule\": {\n		\"连载中\": 0,\n		\"完本\": 1\n	},\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\n	\"descEnd\": \"最新章节推荐地址\",\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\n	\"bookIndexStart\": \"<dt>《\",\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\n	\"contentEnd\": \"http://www.shuquge.com\"\n}', `source_status` = 1, `create_time` = '2020-05-18 12:02:34', `update_time` = '2020-05-18 12:02:34' WHERE `id` = 4;
--- a/sql/sql文件说明.txt
+++ b/sql/sql文件说明.txt
@ -0,0 +1,3 @@
+novel_plus.sqlΪȫ<CEAA><C8AB>sql<71>ļ<EFBFBD><C4BC><EFBFBD>yyyyMMdd.sqlΪ<6C><CEAA><EFBFBD><EFBFBD>sql<71>ļ<EFBFBD><C4BC><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD>ֻ<EFBFBD><EFBFBD>Ҫִ<EFBFBD><EFBFBD>novel_plus.sql<71>ļ<EFBFBD><C4BC><EFBFBD><EFBFBD>ɡ<EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD>´<EFBFBD><EFBFBD><EFBFBD><EFBFBD>󣬸<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴδ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĸ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣬ִ<EFBFBD>и<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֮<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sql<EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD>
Author	SHA1	Message	Date
xiongxiaoyang	68abdeca93	文档更新	2020-05-25 10:59:24 +08:00
xiongxiaoyang	0b505a3922	v2.1.2发布	2020-05-25 10:51:22 +08:00
xiongxiaoyang	353cb8c536	修复网路图片保存时文件损坏的情况	2020-05-25 10:40:50 +08:00
xxy	e1e1310b9e	解决book_index的主键生成冲突	2020-05-24 17:59:03 +08:00
xiongxiaoyang	4c42ac0d29	文档更新	2020-05-24 09:17:49 +08:00
xiongxiaoyang	d025d3d514	优化列表页显示	2020-05-24 02:04:02 +08:00
xiongxiaoyang	a0fb8e481a	1.解决爬虫线程停止失败的bug,2新增新笔趣阁源，兼容更多源站	2020-05-24 00:54:27 +08:00
xiongxiaoyang	80b933db8d	v2.1.1发布	2020-05-22 11:58:42 +08:00
xiongxiaoyang	87a060280a	1.解决小说/章节发布表单重复提交问题，2.解决小说章节发布字数计算问题，3.解决个人发布小说字体更改问题	2020-05-22 11:49:18 +08:00
xiongxiaoyang	9c78f400dc	v2.1.0发布	2020-05-21 09:15:47 +08:00
xiongxiaoyang	c2cdf73893	1优化网络图片转换策略	2020-05-21 08:46:46 +08:00
xiongxiaoyang	a13ea78c3f	1优化es导入策略，2增加默认图片，在读取网络图片失败时设置，防止一直失败重试	2020-05-21 08:16:37 +08:00
xiongxiaoyang	0144b77983	v2.1.0发布	2020-05-20 22:13:53 +08:00
xiongxiaoyang	07b9ffde96	修改版本号	2020-05-20 21:30:19 +08:00
xiongxiaoyang	002a0723f7	索引+搜索优化	2020-05-20 21:23:59 +08:00
xiongxiaoyang	8a628f081f	集成elasticsearch搜索引擎	2020-05-20 18:08:29 +08:00
xiongxiaoyang	4aa6b82143	更新书趣阁规则	2020-05-18 20:13:46 +08:00
xiongxiaoyang	c80b02caf0	v2.0.2发布	2020-05-18 17:31:00 +08:00
xiongxiaoyang	5e16119880	增加笔趣阁书源	2020-05-18 17:08:43 +08:00
xiongxiaoyang	231b94f1da	v2.0.2发布	2020-05-18 14:51:02 +08:00
xiongxiaoyang	92ce982899	1.优化爬虫编写规则，兼容更多网站 2.新增书趣阁书源	2020-05-18 14:01:49 +08:00
xiongxiaoyang	8c2e43c04f	Merge branch 'master' into release_v2.0.1	2020-05-17 22:21:50 +08:00
xiongxiaoyang	f553d23fb9	v2.0.1发布	2020-05-17 22:14:53 +08:00
xxy	9773b73475	修改版本号	2020-05-16 13:29:32 +08:00
xxy	5543b905cd	小说发布防xss攻击	2020-05-16 13:20:08 +08:00
xxy	e273906441	小说发布防xss攻击	2020-05-16 13:05:44 +08:00
xxy	83dc04c50b	Merge branch 'develop' of https://gitee.com/xiongxyang/novel-plus into develop	2020-05-16 12:05:33 +08:00
xxy	b4f5b18e93	1.修复昵称修改不会显示在顶部栏的问题 2.修复底部作者专区超链接问题	2020-05-16 12:01:02 +08:00
phacks	fe80c21812	Merge branch 'develop' of https://gitee.com/xiongxyang/novel-plus into develop	2020-05-16 11:46:11 +08:00
phacks	4c2a7f12c1	gitignore add file	2020-05-16 11:44:33 +08:00
xxy	e24e87b546	修复性别修改问题	2020-05-16 03:05:49 +08:00