update

.gitignore

@@ -14,3 +14,5 @@
 /*.iml
 /novel-admin/*.iml
 .DS_Store
+/novel-admin/cachedata
+/novel-admin/logs

README.md

@@ -1,10 +1,28 @@
-[![index](./assets/热门云产品1040.100.jpg)](https://cloud.tencent.com/act/cps/redirect?redirect=1052&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console)
+[![index]( https://s1.ax1x.com/2020/07/03/NOSA5q.jpg )]( https://cloud.tencent.com/act/cps/redirect?redirect=1052&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console )
 
 # 小说精品屋-plus
 
-#### 演示地址
+#### 新项目：小说精品屋-微服务版
 
-[点击前往](http://www.java2nb.com)（前台门户）
+基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
+
+Gitee仓库地址： https://gitee.com/xiongxyang/novel-cloud
+
+GitHub仓库地址： https://github.com/201206030/novel-cloud
+
+#### 示例网站
+
+[网站1，点击前往](http://www.bqmfxs.cn)
+
+[网站2，点击前往](http://iyuedu.space)
+
+[网站3，点击前往](http://suxiange.com)
+
+[网站4，点击前往](http://ruoshu.com)
+
+[网站5，点击前往](https://www.jingjiao.net)
+
+[网站6，点击前往](http://www.shucheng.in)
 
 #### 前言
 
@@ -12,9 +30,9 @@
 
 #### 项目介绍
 
-[小说精品屋](https://github.com/201206030/fiction_house)是一个多平台（web、安卓app、微信小程序）、功能完善的小说弹幕网站，包含精品小说专区、轻小说专区和漫画专区。包括小说/漫画分类、小说/漫画搜索、小说/漫画排行、完本小说/漫画、小说/漫画评分、小说/漫画在线阅读、小说/漫画书架、小说/漫画阅读记录、小说下载、小说弹幕、小说/漫画自动爬取、小说内容自动分享到微博、邮件自动推广、链接自动推送到百度搜索引擎等功能。包含电脑端、移动端、微信小程序等多个平台，现已开源web端、安卓端、小程序端源码。 
+小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
 
-小说精品屋-plus是在小说精品屋的基础上，重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
+小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
 
 - [x] 数据库重新设计，结构调整。
 - [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
@@ -26,6 +44,7 @@
 - [x] 阅读主题模块。
 - [x] 作家专区。
 - [x] 充值。
+- [x] 订阅。
 - [x] 后台管理系统。
 - [x] 爬虫管理系统。
 
@@ -40,53 +59,115 @@ novel-plus -- 父工程
 ```
 
 #### 技术选型
-Springboot+Mybatis+Mysql+Ehcache+Thymeleaf+Layui
+
+| 技术                 | 说明                                                         
+| -------------------- | ---------------------------
+| SpringBoot           | Spring应用快速开发脚手架     
+| MyBatis              | 持久层ORM框架 
+| MyBatis Dynamic SQL  | Mybatis动态sql
+| PageHelper           | MyBatis分页插件
+| MyBatisGenerator     | 持久层代码生成插件
+| Sharding-Jdbc        | 代码层分库分表中间件
+| JJWT                 | JWT登录支持  
+| SpringSecurity       | 安全框架                           
+| Shiro                | 安全框架  
+| Ehcache              | Java进程内缓存框架(默认缓存)  
+| Redis                | 分布式缓存(缓存替换方案，默认关闭，一行配置开启)                               
+| ElasticSearch        | 搜索引擎(搜索增强方案，默认关闭，一行配置开启)                      
+| RabbitMq             | 消息队列(流量削峰，默认关闭，一行配置开启)  
+| OSS                  | 阿里云对象存储服务(图片存储方式之一，一行配置即可切换) 
+| FastDfs              |开源轻量级分布式文件系统(图片存储方式之一，一行配置即可切换)                      
+| Redisson             | 实现分布式锁                                       
+| Lombok               | 简化对象封装工具                                                                               
+| Docker               | 应用容器引擎   
+| Mysql                | 数据库服务   
+| Thymeleaf            | 模板引擎     
+| Layui                | 前端UI                    
+                 
 
 #### 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://s3.ax1x.com/2020/11/17/DVFiQI.png)
+
+![img](https://s1.ax1x.com/2020/11/09/B7X5oF.png)
+
+![img](https://s1.ax1x.com/2020/11/09/B7XLsx.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://s1.ax1x.com/2020/11/03/BsOgbD.png)
 
+![img](https://s1.ax1x.com/2020/11/03/BsOHr8.png)
 
+#### 后台管理系统截图
+
+![img](https://oscimg.oschina.net/oscnet/up-0552343538674a22a64819834100558f39b.png)
+
+![img](https://oscimg.oschina.net/oscnet/up-faf5dda7320674c29a1772bc0c81d74762e.png)
 
 #### 安装步骤
 
@@ -127,16 +208,25 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 #### QQ交流群
 
-![mini-code](./assets/qq_group.png)
+![mini-code](https://s1.ax1x.com/2020/10/31/BUQVeI.png)
 
-#### 捐赠支持
+#### 赞赏支持
 
-开源项目不易，若此项目能得到你的青睐，可以捐赠支持作者持续开发与维护。 
+开源项目不易，若此项目能得到你的青睐，那么你可以赞赏支持作者持续开发与维护。
 
-![mini-code](./assets/jk.png)
+- 服务器的费用也是一笔开销
+- 为用户提供更好的开发环境
+- 一杯咖啡 
+
+![mini-code](https://s1.ax1x.com/2020/10/31/BUQJwq.png)
+
+### 免责声明
+
+本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。
+用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
 
 #### 备注
 
 精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
 
-[![index](./assets/120060.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )
+[![index](https://s1.ax1x.com/2020/07/03/NOSuMF.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )

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"
+        }
+
+
+      }
+    }
+  }
+}

novel-admin/Dockerfile

@@ -0,0 +1,6 @@
+FROM java:8
+ADD novel-admin-1.0.0.jar /root
+ENV dburl=""
+ENV username=""
+ENV	password=""
+ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -jar /root/novel-admin-1.0.0.jar"]

novel-admin/logs/debug.log

@@ -1,5 +0,0 @@
-2020-05-13 21:52:00,972 INFO (StartupInfoLogger.java:50)- Starting TestDemo on USER-20180729KA with PID 3532 (started by Administrator in E:\baseprojectparent\novel-plus\novel-admin)
-2020-05-13 21:52:01,113 DEBUG (StartupInfoLogger.java:53)- Running with Spring Boot v2.0.1.RELEASE, Spring v5.0.5.RELEASE
-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)

novel-admin/pom.xml

@@ -137,10 +137,6 @@
             <artifactId>velocity</artifactId>
             <version>1.7</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
         <!--<dependency>-->
         <!--<groupId>org.springframework.boot</groupId>-->
         <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->

novel-admin/src/main/java/com/java2nb/novel/controller/BookController.java

@@ -1,135 +0,0 @@
-package com.java2nb.novel.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import io.swagger.annotations.ApiOperation;
-
-
-import com.java2nb.novel.domain.BookDO;
-import com.java2nb.novel.service.BookService;
-import com.java2nb.common.utils.PageBean;
-import com.java2nb.common.utils.Query;
-import com.java2nb.common.utils.R;
-
-/**
- * 小说表
- *
- * @author phacks
- * @email 1179705413@qq.com
- * @date 2020-05-16 15:08:34
- */
-
-@Controller
-@RequestMapping("/novel/book")
-public class BookController {
-    @Autowired
-    private BookService bookService;
-
-    @GetMapping()
-    @RequiresPermissions("novel:book:book")
-    String Book() {
-        return "novel/book/book";
-    }
-
-    @ApiOperation(value = "获取小说表列表", notes = "获取小说表列表")
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("novel:book:book")
-    public R list(@RequestParam Map<String, Object> params) {
-        //查询列表数据
-        Query query = new Query(params);
-        List<BookDO> bookList = bookService.list(query);
-        int total = bookService.count(query);
-        PageBean pageBean = new PageBean(bookList, total);
-        return R.ok().put("data", pageBean);
-    }
-
-    @ApiOperation(value = "新增小说表页面", notes = "新增小说表页面")
-    @GetMapping("/add")
-    @RequiresPermissions("novel:book:add")
-    String add() {
-        return "novel/book/add";
-    }
-
-    @ApiOperation(value = "修改小说表页面", notes = "修改小说表页面")
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("novel:book:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-            BookDO book = bookService.get(id);
-        model.addAttribute("book", book);
-        return "novel/book/edit";
-    }
-
-    @ApiOperation(value = "查看小说表页面", notes = "查看小说表页面")
-    @GetMapping("/detail/{id}")
-    @RequiresPermissions("novel:book:detail")
-    String detail(@PathVariable("id") Long id, Model model) {
-			BookDO book = bookService.get(id);
-        model.addAttribute("book", book);
-        return "novel/book/detail";
-    }
-
-    /**
-     * 保存
-     */
-    @ApiOperation(value = "新增小说表", notes = "新增小说表")
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("novel:book:add")
-    public R save( BookDO book) {
-        if (bookService.save(book) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ApiOperation(value = "修改小说表", notes = "修改小说表")
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("novel:book:edit")
-    public R update( BookDO book) {
-            bookService.update(book);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "删除小说表", notes = "删除小说表")
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("novel:book:remove")
-    public R remove( Long id) {
-        if (bookService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "批量删除小说表", notes = "批量删除小说表")
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("novel:book:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-            bookService.batchRemove(ids);
-        return R.ok();
-    }
-
-}

novel-admin/src/main/java/com/java2nb/novel/dao/BookDao.java

@@ -1,32 +0,0 @@
-package com.java2nb.novel.dao;
-
-import com.java2nb.novel.domain.BookDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 小说表
- * @author phacks
- * @email 1179705413@qq.com
- * @date 2020-05-16 15:08:34
- */
-@Mapper
-public interface BookDao {
-
-	BookDO get(Long id);
-	
-	List<BookDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(BookDO book);
-	
-	int update(BookDO book);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

novel-admin/src/main/java/com/java2nb/novel/domain/BookDO.java

@@ -1,395 +0,0 @@
-package com.java2nb.novel.domain;
-
-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-
-
-/**
- * 小说表
- * 
- * @author phacks
- * @email 1179705413@qq.com
- * @date 2020-05-16 15:08:34
- */
-public class BookDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	
-	//主键
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//作品方向，0：男频，1：女频'
-			private Integer workDirection;
-	//分类ID
-			private Integer catId;
-	//分类名
-			private String catName;
-	//小说封面
-			private String picUrl;
-	//小说名
-			private String bookName;
-	//作者id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long authorId;
-	//作者名
-			private String authorName;
-	//书籍描述
-			private String bookDesc;
-	//评分，预留字段
-			private Float score;
-	//书籍状态，0：连载中，1：已完结
-			private Integer bookStatus;
-	//点击量
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long visitCount;
-	//总字数
-			private Integer wordCount;
-	//评论数
-			private Integer commentCount;
-	//最新目录ID
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long lastIndexId;
-	//最新目录名
-			private String lastIndexName;
-	//最新目录更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date lastIndexUpdateTime;
-	//是否收费，1：收费，0：免费
-			private Integer isVip;
-	//状态，0：入库，1：上架
-			private Integer status;
-	//更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date updateTime;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//爬虫源站ID
-			private Integer crawlSourceId;
-	//抓取的源站小说ID
-			private String crawlBookId;
-	//最后一次的抓取时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date crawlLastTime;
-	//是否已停止更新，0：未停止，1：已停止
-			private Integer crawlIsStop;
-
-	/**
-	 * 设置：主键
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：作品方向，0：男频，1：女频'
-	 */
-	public void setWorkDirection(Integer workDirection) {
-		this.workDirection = workDirection;
-	}
-	/**
-	 * 获取：作品方向，0：男频，1：女频'
-	 */
-	public Integer getWorkDirection() {
-		return workDirection;
-	}
-	/**
-	 * 设置：分类ID
-	 */
-	public void setCatId(Integer catId) {
-		this.catId = catId;
-	}
-	/**
-	 * 获取：分类ID
-	 */
-	public Integer getCatId() {
-		return catId;
-	}
-	/**
-	 * 设置：分类名
-	 */
-	public void setCatName(String catName) {
-		this.catName = catName;
-	}
-	/**
-	 * 获取：分类名
-	 */
-	public String getCatName() {
-		return catName;
-	}
-	/**
-	 * 设置：小说封面
-	 */
-	public void setPicUrl(String picUrl) {
-		this.picUrl = picUrl;
-	}
-	/**
-	 * 获取：小说封面
-	 */
-	public String getPicUrl() {
-		return picUrl;
-	}
-	/**
-	 * 设置：小说名
-	 */
-	public void setBookName(String bookName) {
-		this.bookName = bookName;
-	}
-	/**
-	 * 获取：小说名
-	 */
-	public String getBookName() {
-		return bookName;
-	}
-	/**
-	 * 设置：作者id
-	 */
-	public void setAuthorId(Long authorId) {
-		this.authorId = authorId;
-	}
-	/**
-	 * 获取：作者id
-	 */
-	public Long getAuthorId() {
-		return authorId;
-	}
-	/**
-	 * 设置：作者名
-	 */
-	public void setAuthorName(String authorName) {
-		this.authorName = authorName;
-	}
-	/**
-	 * 获取：作者名
-	 */
-	public String getAuthorName() {
-		return authorName;
-	}
-	/**
-	 * 设置：书籍描述
-	 */
-	public void setBookDesc(String bookDesc) {
-		this.bookDesc = bookDesc;
-	}
-	/**
-	 * 获取：书籍描述
-	 */
-	public String getBookDesc() {
-		return bookDesc;
-	}
-	/**
-	 * 设置：评分，预留字段
-	 */
-	public void setScore(Float score) {
-		this.score = score;
-	}
-	/**
-	 * 获取：评分，预留字段
-	 */
-	public Float getScore() {
-		return score;
-	}
-	/**
-	 * 设置：书籍状态，0：连载中，1：已完结
-	 */
-	public void setBookStatus(Integer bookStatus) {
-		this.bookStatus = bookStatus;
-	}
-	/**
-	 * 获取：书籍状态，0：连载中，1：已完结
-	 */
-	public Integer getBookStatus() {
-		return bookStatus;
-	}
-	/**
-	 * 设置：点击量
-	 */
-	public void setVisitCount(Long visitCount) {
-		this.visitCount = visitCount;
-	}
-	/**
-	 * 获取：点击量
-	 */
-	public Long getVisitCount() {
-		return visitCount;
-	}
-	/**
-	 * 设置：总字数
-	 */
-	public void setWordCount(Integer wordCount) {
-		this.wordCount = wordCount;
-	}
-	/**
-	 * 获取：总字数
-	 */
-	public Integer getWordCount() {
-		return wordCount;
-	}
-	/**
-	 * 设置：评论数
-	 */
-	public void setCommentCount(Integer commentCount) {
-		this.commentCount = commentCount;
-	}
-	/**
-	 * 获取：评论数
-	 */
-	public Integer getCommentCount() {
-		return commentCount;
-	}
-	/**
-	 * 设置：最新目录ID
-	 */
-	public void setLastIndexId(Long lastIndexId) {
-		this.lastIndexId = lastIndexId;
-	}
-	/**
-	 * 获取：最新目录ID
-	 */
-	public Long getLastIndexId() {
-		return lastIndexId;
-	}
-	/**
-	 * 设置：最新目录名
-	 */
-	public void setLastIndexName(String lastIndexName) {
-		this.lastIndexName = lastIndexName;
-	}
-	/**
-	 * 获取：最新目录名
-	 */
-	public String getLastIndexName() {
-		return lastIndexName;
-	}
-	/**
-	 * 设置：最新目录更新时间
-	 */
-	public void setLastIndexUpdateTime(Date lastIndexUpdateTime) {
-		this.lastIndexUpdateTime = lastIndexUpdateTime;
-	}
-	/**
-	 * 获取：最新目录更新时间
-	 */
-	public Date getLastIndexUpdateTime() {
-		return lastIndexUpdateTime;
-	}
-	/**
-	 * 设置：是否收费，1：收费，0：免费
-	 */
-	public void setIsVip(Integer isVip) {
-		this.isVip = isVip;
-	}
-	/**
-	 * 获取：是否收费，1：收费，0：免费
-	 */
-	public Integer getIsVip() {
-		return isVip;
-	}
-	/**
-	 * 设置：状态，0：入库，1：上架
-	 */
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-	/**
-	 * 获取：状态，0：入库，1：上架
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-	/**
-	 * 设置：更新时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：更新时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：爬虫源站ID
-	 */
-	public void setCrawlSourceId(Integer crawlSourceId) {
-		this.crawlSourceId = crawlSourceId;
-	}
-	/**
-	 * 获取：爬虫源站ID
-	 */
-	public Integer getCrawlSourceId() {
-		return crawlSourceId;
-	}
-	/**
-	 * 设置：抓取的源站小说ID
-	 */
-	public void setCrawlBookId(String crawlBookId) {
-		this.crawlBookId = crawlBookId;
-	}
-	/**
-	 * 获取：抓取的源站小说ID
-	 */
-	public String getCrawlBookId() {
-		return crawlBookId;
-	}
-	/**
-	 * 设置：最后一次的抓取时间
-	 */
-	public void setCrawlLastTime(Date crawlLastTime) {
-		this.crawlLastTime = crawlLastTime;
-	}
-	/**
-	 * 获取：最后一次的抓取时间
-	 */
-	public Date getCrawlLastTime() {
-		return crawlLastTime;
-	}
-	/**
-	 * 设置：是否已停止更新，0：未停止，1：已停止
-	 */
-	public void setCrawlIsStop(Integer crawlIsStop) {
-		this.crawlIsStop = crawlIsStop;
-	}
-	/**
-	 * 获取：是否已停止更新，0：未停止，1：已停止
-	 */
-	public Integer getCrawlIsStop() {
-		return crawlIsStop;
-	}
-}

novel-admin/src/main/java/com/java2nb/novel/service/BookService.java

@@ -1,30 +0,0 @@
-package com.java2nb.novel.service;
-
-import com.java2nb.novel.domain.BookDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 小说表
- * 
- * @author phacks
- * @email 1179705413@qq.com
- * @date 2020-05-16 15:08:34
- */
-public interface BookService {
-	
-	BookDO get(Long id);
-	
-	List<BookDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(BookDO book);
-	
-	int update(BookDO book);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}

novel-admin/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java

@@ -1,55 +0,0 @@
-package com.java2nb.novel.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.java2nb.novel.dao.BookDao;
-import com.java2nb.novel.domain.BookDO;
-import com.java2nb.novel.service.BookService;
-
-
-
-@Service
-public class BookServiceImpl implements BookService {
-	@Autowired
-	private BookDao bookDao;
-	
-	@Override
-	public BookDO get(Long id){
-		return bookDao.get(id);
-	}
-	
-	@Override
-	public List<BookDO> list(Map<String, Object> map){
-		return bookDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return bookDao.count(map);
-	}
-	
-	@Override
-	public int save(BookDO book){
-		return bookDao.save(book);
-	}
-	
-	@Override
-	public int update(BookDO book){
-		return bookDao.update(book);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return bookDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return bookDao.batchRemove(ids);
-	}
-	
-}

novel-admin/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
     username: root
-    password:
+    password: test123456
     #password:
     initialSize: 1
     minIdle: 3

novel-admin/src/main/resources/mybatis/novel/BookMapper.xml

@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.java2nb.novel.dao.BookDao">
-
-	<select id="get" resultType="com.java2nb.novel.domain.BookDO">
-		select `id`,`work_direction`,`cat_id`,`cat_name`,`pic_url`,`book_name`,`author_id`,`author_name`,`book_desc`,`score`,`book_status`,`visit_count`,`word_count`,`comment_count`,`last_index_id`,`last_index_name`,`last_index_update_time`,`is_vip`,`status`,`update_time`,`create_time`,`crawl_source_id`,`crawl_book_id`,`crawl_last_time`,`crawl_is_stop` from book where id = #{value}
-	</select>
-
-	<select id="list" resultType="com.java2nb.novel.domain.BookDO">
-		select `id`,`work_direction`,`cat_id`,`cat_name`,`pic_url`,`book_name`,`author_id`,`author_name`,`book_desc`,`score`,`book_status`,`visit_count`,`word_count`,`comment_count`,`last_index_id`,`last_index_name`,`last_index_update_time`,`is_vip`,`status`,`update_time`,`create_time`,`crawl_source_id`,`crawl_book_id`,`crawl_last_time`,`crawl_is_stop` from book
-        <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="workDirection != null and workDirection != ''"> and work_direction = #{workDirection} </if>
-		  		  <if test="catId != null and catId != ''"> and cat_id = #{catId} </if>
-		  		  <if test="catName != null and catName != ''"> and cat_name = #{catName} </if>
-		  		  <if test="picUrl != null and picUrl != ''"> and pic_url = #{picUrl} </if>
-		  		  <if test="bookName != null and bookName != ''"> and book_name = #{bookName} </if>
-		  		  <if test="authorId != null and authorId != ''"> and author_id = #{authorId} </if>
-		  		  <if test="authorName != null and authorName != ''"> and author_name = #{authorName} </if>
-		  		  <if test="bookDesc != null and bookDesc != ''"> and book_desc = #{bookDesc} </if>
-		  		  <if test="score != null and score != ''"> and score = #{score} </if>
-		  		  <if test="bookStatus != null and bookStatus != ''"> and book_status = #{bookStatus} </if>
-		  		  <if test="visitCount != null and visitCount != ''"> and visit_count = #{visitCount} </if>
-		  		  <if test="wordCount != null and wordCount != ''"> and word_count = #{wordCount} </if>
-		  		  <if test="commentCount != null and commentCount != ''"> and comment_count = #{commentCount} </if>
-		  		  <if test="lastIndexId != null and lastIndexId != ''"> and last_index_id = #{lastIndexId} </if>
-		  		  <if test="lastIndexName != null and lastIndexName != ''"> and last_index_name = #{lastIndexName} </if>
-		  		  <if test="lastIndexUpdateTime != null and lastIndexUpdateTime != ''"> and last_index_update_time = #{lastIndexUpdateTime} </if>
-		  		  <if test="isVip != null and isVip != ''"> and is_vip = #{isVip} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="crawlSourceId != null and crawlSourceId != ''"> and crawl_source_id = #{crawlSourceId} </if>
-		  		  <if test="crawlBookId != null and crawlBookId != ''"> and crawl_book_id = #{crawlBookId} </if>
-		  		  <if test="crawlLastTime != null and crawlLastTime != ''"> and crawl_last_time = #{crawlLastTime} </if>
-		  		  <if test="crawlIsStop != null and crawlIsStop != ''"> and crawl_is_stop = #{crawlIsStop} </if>
-		  		</where>
-        <choose>
-            <when test="sort != null and sort.trim() != ''">
-                order by ${sort} ${order}
-            </when>
-			<otherwise>
-                order by id desc
-			</otherwise>
-        </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
-	
- 	<select id="count" resultType="int">
-		select count(*) from book
-		 <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="workDirection != null and workDirection != ''"> and work_direction = #{workDirection} </if>
-		  		  <if test="catId != null and catId != ''"> and cat_id = #{catId} </if>
-		  		  <if test="catName != null and catName != ''"> and cat_name = #{catName} </if>
-		  		  <if test="picUrl != null and picUrl != ''"> and pic_url = #{picUrl} </if>
-		  		  <if test="bookName != null and bookName != ''"> and book_name = #{bookName} </if>
-		  		  <if test="authorId != null and authorId != ''"> and author_id = #{authorId} </if>
-		  		  <if test="authorName != null and authorName != ''"> and author_name = #{authorName} </if>
-		  		  <if test="bookDesc != null and bookDesc != ''"> and book_desc = #{bookDesc} </if>
-		  		  <if test="score != null and score != ''"> and score = #{score} </if>
-		  		  <if test="bookStatus != null and bookStatus != ''"> and book_status = #{bookStatus} </if>
-		  		  <if test="visitCount != null and visitCount != ''"> and visit_count = #{visitCount} </if>
-		  		  <if test="wordCount != null and wordCount != ''"> and word_count = #{wordCount} </if>
-		  		  <if test="commentCount != null and commentCount != ''"> and comment_count = #{commentCount} </if>
-		  		  <if test="lastIndexId != null and lastIndexId != ''"> and last_index_id = #{lastIndexId} </if>
-		  		  <if test="lastIndexName != null and lastIndexName != ''"> and last_index_name = #{lastIndexName} </if>
-		  		  <if test="lastIndexUpdateTime != null and lastIndexUpdateTime != ''"> and last_index_update_time = #{lastIndexUpdateTime} </if>
-		  		  <if test="isVip != null and isVip != ''"> and is_vip = #{isVip} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="crawlSourceId != null and crawlSourceId != ''"> and crawl_source_id = #{crawlSourceId} </if>
-		  		  <if test="crawlBookId != null and crawlBookId != ''"> and crawl_book_id = #{crawlBookId} </if>
-		  		  <if test="crawlLastTime != null and crawlLastTime != ''"> and crawl_last_time = #{crawlLastTime} </if>
-		  		  <if test="crawlIsStop != null and crawlIsStop != ''"> and crawl_is_stop = #{crawlIsStop} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.java2nb.novel.domain.BookDO" useGeneratedKeys="true" keyProperty="id">
-		insert into book
-		(
-			`work_direction`, 
-			`cat_id`, 
-			`cat_name`, 
-			`pic_url`, 
-			`book_name`, 
-			`author_id`, 
-			`author_name`, 
-			`book_desc`, 
-			`score`, 
-			`book_status`, 
-			`visit_count`, 
-			`word_count`, 
-			`comment_count`, 
-			`last_index_id`, 
-			`last_index_name`, 
-			`last_index_update_time`, 
-			`is_vip`, 
-			`status`, 
-			`update_time`, 
-			`create_time`, 
-			`crawl_source_id`, 
-			`crawl_book_id`, 
-			`crawl_last_time`, 
-			`crawl_is_stop`
-		)
-		values
-		(
-			#{workDirection}, 
-			#{catId}, 
-			#{catName}, 
-			#{picUrl}, 
-			#{bookName}, 
-			#{authorId}, 
-			#{authorName}, 
-			#{bookDesc}, 
-			#{score}, 
-			#{bookStatus}, 
-			#{visitCount}, 
-			#{wordCount}, 
-			#{commentCount}, 
-			#{lastIndexId}, 
-			#{lastIndexName}, 
-			#{lastIndexUpdateTime}, 
-			#{isVip}, 
-			#{status}, 
-			#{updateTime}, 
-			#{createTime}, 
-			#{crawlSourceId}, 
-			#{crawlBookId}, 
-			#{crawlLastTime}, 
-			#{crawlIsStop}
-		)
-	</insert>
-
-	<insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookDO" useGeneratedKeys="true" keyProperty="id">
-		insert into book
-		(
-					<if test="id != null"> `id`,  </if>
-					<if test="workDirection != null"> `work_direction`,  </if>
-					<if test="catId != null"> `cat_id`,  </if>
-					<if test="catName != null"> `cat_name`,  </if>
-					<if test="picUrl != null"> `pic_url`,  </if>
-					<if test="bookName != null"> `book_name`,  </if>
-					<if test="authorId != null"> `author_id`,  </if>
-					<if test="authorName != null"> `author_name`,  </if>
-					<if test="bookDesc != null"> `book_desc`,  </if>
-					<if test="score != null"> `score`,  </if>
-					<if test="bookStatus != null"> `book_status`,  </if>
-					<if test="visitCount != null"> `visit_count`,  </if>
-					<if test="wordCount != null"> `word_count`,  </if>
-					<if test="commentCount != null"> `comment_count`,  </if>
-					<if test="lastIndexId != null"> `last_index_id`,  </if>
-					<if test="lastIndexName != null"> `last_index_name`,  </if>
-					<if test="lastIndexUpdateTime != null"> `last_index_update_time`,  </if>
-					<if test="isVip != null"> `is_vip`,  </if>
-					<if test="status != null"> `status`,  </if>
-					<if test="updateTime != null"> `update_time`,  </if>
-					<if test="createTime != null"> `create_time`,  </if>
-					<if test="crawlSourceId != null"> `crawl_source_id`,  </if>
-					<if test="crawlBookId != null"> `crawl_book_id`,  </if>
-					<if test="crawlLastTime != null"> `crawl_last_time`,  </if>
-					<if test="crawlIsStop != null"> `crawl_is_stop` </if>
-				)
-		values
-		(
-					<if test="id != null"> #{id},  </if>
-					<if test="workDirection != null"> #{workDirection},  </if>
-					<if test="catId != null"> #{catId},  </if>
-					<if test="catName != null"> #{catName},  </if>
-					<if test="picUrl != null"> #{picUrl},  </if>
-					<if test="bookName != null"> #{bookName},  </if>
-					<if test="authorId != null"> #{authorId},  </if>
-					<if test="authorName != null"> #{authorName},  </if>
-					<if test="bookDesc != null"> #{bookDesc},  </if>
-					<if test="score != null"> #{score},  </if>
-					<if test="bookStatus != null"> #{bookStatus},  </if>
-					<if test="visitCount != null"> #{visitCount},  </if>
-					<if test="wordCount != null"> #{wordCount},  </if>
-					<if test="commentCount != null"> #{commentCount},  </if>
-					<if test="lastIndexId != null"> #{lastIndexId},  </if>
-					<if test="lastIndexName != null"> #{lastIndexName},  </if>
-					<if test="lastIndexUpdateTime != null"> #{lastIndexUpdateTime},  </if>
-					<if test="isVip != null"> #{isVip},  </if>
-					<if test="status != null"> #{status},  </if>
-					<if test="updateTime != null"> #{updateTime},  </if>
-					<if test="createTime != null"> #{createTime},  </if>
-					<if test="crawlSourceId != null"> #{crawlSourceId},  </if>
-					<if test="crawlBookId != null"> #{crawlBookId},  </if>
-					<if test="crawlLastTime != null"> #{crawlLastTime},  </if>
-					<if test="crawlIsStop != null"> #{crawlIsStop} </if>
-				)
-	</insert>
-	 
-	<update id="update" parameterType="com.java2nb.novel.domain.BookDO">
-		update book 
-		<set>
-			<if test="workDirection != null">`work_direction` = #{workDirection}, </if>
-			<if test="catId != null">`cat_id` = #{catId}, </if>
-			<if test="catName != null">`cat_name` = #{catName}, </if>
-			<if test="picUrl != null">`pic_url` = #{picUrl}, </if>
-			<if test="bookName != null">`book_name` = #{bookName}, </if>
-			<if test="authorId != null">`author_id` = #{authorId}, </if>
-			<if test="authorName != null">`author_name` = #{authorName}, </if>
-			<if test="bookDesc != null">`book_desc` = #{bookDesc}, </if>
-			<if test="score != null">`score` = #{score}, </if>
-			<if test="bookStatus != null">`book_status` = #{bookStatus}, </if>
-			<if test="visitCount != null">`visit_count` = #{visitCount}, </if>
-			<if test="wordCount != null">`word_count` = #{wordCount}, </if>
-			<if test="commentCount != null">`comment_count` = #{commentCount}, </if>
-			<if test="lastIndexId != null">`last_index_id` = #{lastIndexId}, </if>
-			<if test="lastIndexName != null">`last_index_name` = #{lastIndexName}, </if>
-			<if test="lastIndexUpdateTime != null">`last_index_update_time` = #{lastIndexUpdateTime}, </if>
-			<if test="isVip != null">`is_vip` = #{isVip}, </if>
-			<if test="status != null">`status` = #{status}, </if>
-			<if test="updateTime != null">`update_time` = #{updateTime}, </if>
-			<if test="createTime != null">`create_time` = #{createTime}, </if>
-			<if test="crawlSourceId != null">`crawl_source_id` = #{crawlSourceId}, </if>
-			<if test="crawlBookId != null">`crawl_book_id` = #{crawlBookId}, </if>
-			<if test="crawlLastTime != null">`crawl_last_time` = #{crawlLastTime}, </if>
-			<if test="crawlIsStop != null">`crawl_is_stop` = #{crawlIsStop}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="remove">
-		delete from book where id = #{value}
-	</delete>
-	
-	<delete id="batchRemove">
-		delete from book where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
-
-</mapper>

novel-admin/src/main/resources/static/js/appjs/novel/book/add.js

@@ -1,107 +0,0 @@
-var E = window.wangEditor;
-$("[id^='contentEditor']").each(function (index, ele) {
-    var relName = $(ele).attr("id").substring(13);
-    var editor = new E('#contentEditor' + relName);
-// 自定义菜单配置
-    editor.customConfig.menus = [
-        'head',  // 标题
-        'bold',  // 粗体
-        'fontSize',  // 字号
-        'fontName',  // 字体
-        'italic',  // 斜体
-        'underline',  // 下划线
-        'strikeThrough',  // 删除线
-        'foreColor',  // 文字颜色
-        //'backColor',  // 背景颜色
-        //'link',  // 插入链接
-        'list',  // 列表
-        'justify',  // 对齐方式
-        'quote',  // 引用
-        'emoticon',  // 表情
-        'image',  // 插入图片
-        //'table',  // 表格
-        //'video',  // 插入视频
-        //'code',  // 插入代码
-        'undo',  // 撤销
-        'redo'  // 重复
-    ];
-    editor.customConfig.onchange = function (html) {
-        // html 即变化之后的内容
-        $("#" + relName).val(html);
-    }
-    editor.customConfig.uploadImgShowBase64 = true;
-    editor.create();
-
-})
-
-$("[id^='picImage']").each(function (index, ele) {
-    var relName = $(ele).attr("id").substring(8);
-    layui.use('upload', function () {
-        var upload = layui.upload;
-        //执行实例
-        var uploadInst = upload.render({
-            elem: '#picImage' + relName, //绑定元素
-            url: '/common/sysFile/upload', //上传接口
-            size: 1000,
-            accept: 'file',
-            done: function (r) {
-                $("#picImage" + relName).attr("src", r.fileName);
-                $("#" + relName).val(r.fileName);
-            },
-            error: function (r) {
-                layer.msg(r.msg);
-            }
-        });
-    });
-
-});
-
-
-
-
-
-
-$().ready(function () {
-    validateRule();
-});
-
-$.validator.setDefaults({
-    submitHandler: function () {
-        save();
-    }
-});
-function save() {
-    $.ajax({
-        cache: true,
-        type: "POST",
-        url: "/novel/book/save",
-        data: $('#signupForm').serialize(),// 你的formid
-        async: false,
-        error: function (request) {
-            parent.layer.alert("Connection error");
-        },
-        success: function (data) {
-            if (data.code == 0) {
-                parent.layer.msg("操作成功");
-                parent.reLoad();
-                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                parent.layer.close(index);
-
-            } else {
-                parent.layer.alert(data.msg)
-            }
-
-        }
-    });
-
-}
-function validateRule() {
-    var icon = "<i class='fa fa-times-circle'></i> ";
-        $("#signupForm").validate({
-            ignore: "",
-            rules: {
-                                                                                                                                                                                                                                                                                                                    },
-    messages: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                }
-})
-}

novel-admin/src/main/resources/static/js/appjs/novel/book/book.js

@@ -1,321 +0,0 @@
-var prefix = "/novel/book"
-$(function () {
-    load();
-});
-
-function load() {
-    $('#exampleTable')
-        .bootstrapTable(
-            {
-                method: 'get', // 服务器数据的请求方式 get or post
-                url: prefix + "/list", // 服务器数据的加载地址
-                //	showRefresh : true,
-                //	showToggle : true,
-                //	showColumns : true,
-                iconSize: 'outline',
-                toolbar: '#exampleToolbar',
-                striped: true, // 设置为true会有隔行变色效果
-                dataType: "json", // 服务器返回的数据类型
-                pagination: true, // 设置为true会在底部显示分页条
-                // queryParamsType : "limit",
-                // //设置为limit则会发送符合RESTFull格式的参数
-                singleSelect: false, // 设置为true将禁止多选
-                // contentType : "application/x-www-form-urlencoded",
-                // //发送到服务器的数据编码类型
-                pageSize: 10, // 如果设置了分页，每页数据条数
-                pageNumber: 1, // 如果设置了分布，首页页码
-                //search : true, // 是否显示搜索框
-                showColumns: false, // 是否显示内容下拉框（选择显示的列）
-                sidePagination: "server", // 设置在哪里进行分页，可选值为"client" 或者 "server"
-                queryParams: function (params) {
-                    //说明：传入后台的参数包括offset开始索引，limit步长，sort排序列，order：desc或者,以及所有列的键值对
-                    var queryParams = getFormJson("searchForm");
-                    queryParams.limit = params.limit;
-                    queryParams.offset = params.offset;
-                    return queryParams;
-                },
-                // //请求服务器数据时，你可以通过重写参数的方式添加一些额外的参数，例如 toolbar 中的参数 如果
-                // queryParamsType = 'limit' ,返回参数必须包含
-                // limit, offset, search, sort, order 否则, 需要包含:
-                // pageSize, pageNumber, searchText, sortName,
-                // sortOrder.
-                // 返回false将会终止请求
-                responseHandler: function (rs) {
-
-                    if (rs.code == 0) {
-                        return rs.data;
-                    } else {
-                        parent.layer.alert(rs.msg)
-                        return {total: 0, rows: []};
-                    }
-                },
-                columns: [
-                    {
-                        checkbox: true
-                    },
-                    {
-                        title: '序号',
-                        formatter: function () {
-                            return arguments[2] + 1;
-                        }
-                    },
-                                                                        {
-                                field: 'id',
-                                title: '主键'
-                            },
-
-                        
-                                                                        {
-                                field: 'workDirection',
-                                title: '作品方向，0：男频，1：女频'
-                            },
-
-                        
-                                                                        {
-                                field: 'catId',
-                                title: '分类ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'catName',
-                                title: '分类名'
-                            },
-
-                        
-                                                                        {
-                                field: 'picUrl',
-                                title: '小说封面'
-                            },
-
-                        
-                                                                        {
-                                field: 'bookName',
-                                title: '小说名'
-                            },
-
-                        
-                                                                        {
-                                field: 'authorId',
-                                title: '作者id'
-                            },
-
-                        
-                                                                        {
-                                field: 'authorName',
-                                title: '作者名'
-                            },
-
-                        
-                                                                        {
-                                field: 'bookDesc',
-                                title: '书籍描述'
-                            },
-
-                        
-                                                                        {
-                                field: 'score',
-                                title: '评分，预留字段'
-                            },
-
-                        
-                                                                        {
-                                field: 'bookStatus',
-                                title: '书籍状态，0：连载中，1：已完结'
-                            },
-
-                        
-                                                                        {
-                                field: 'visitCount',
-                                title: '点击量'
-                            },
-
-                        
-                                                                        {
-                                field: 'wordCount',
-                                title: '总字数'
-                            },
-
-                        
-                                                                        {
-                                field: 'commentCount',
-                                title: '评论数'
-                            },
-
-                        
-                                                                        {
-                                field: 'lastIndexId',
-                                title: '最新目录ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'lastIndexName',
-                                title: '最新目录名'
-                            },
-
-                        
-                                                                        {
-                                field: 'lastIndexUpdateTime',
-                                title: '最新目录更新时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'isVip',
-                                title: '是否收费，1：收费，0：免费'
-                            },
-
-                        
-                                                                        {
-                                field: 'status',
-                                title: '状态，0：入库，1：上架'
-                            },
-
-                        
-                                                                        {
-                                field: 'updateTime',
-                                title: '更新时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'createTime',
-                                title: '创建时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlSourceId',
-                                title: '爬虫源站ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlBookId',
-                                title: '抓取的源站小说ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlLastTime',
-                                title: '最后一次的抓取时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlIsStop',
-                                title: '是否已停止更新，0：未停止，1：已停止'
-                            },
-
-                        
-                                        {
-                        title: '操作',
-                        field: 'id',
-                        align: 'center',
-                        formatter: function (value, row, index) {
-                            var d = '<a class="btn btn-primary btn-sm ' + s_detail_h + '" href="#" mce_href="#" title="详情" onclick="detail(\''
-                                + row.id
-                                + '\')"><i class="fa fa-file"></i></a> ';
-                            var e = '<a class="btn btn-primary btn-sm ' + s_edit_h + '" href="#" mce_href="#" title="编辑" onclick="edit(\''
-                                + row.id
-                                + '\')"><i class="fa fa-edit"></i></a> ';
-                            var r = '<a class="btn btn-warning btn-sm ' + s_remove_h + '" href="#" title="删除"  mce_href="#" onclick="remove(\''
-                                + row.id
-                                + '\')"><i class="fa fa-remove"></i></a> ';
-                            return d + e + r;
-                        }
-                    }]
-            });
-}
-function reLoad() {
-    $('#exampleTable').bootstrapTable('refresh');
-}
-function add() {
-    layer.open({
-        type: 2,
-        title: '增加',
-        maxmin: true,
-        shadeClose: false, // 点击遮罩关闭层
-        area: ['800px', '520px'],
-        content: prefix + '/add' // iframe的url
-    });
-}
-function detail(id) {
-    layer.open({
-        type: 2,
-        title: '详情',
-        maxmin: true,
-        shadeClose: false, // 点击遮罩关闭层
-        area: ['800px', '520px'],
-        content: prefix + '/detail/' + id // iframe的url
-    });
-}
-function edit(id) {
-    layer.open({
-        type: 2,
-        title: '编辑',
-        maxmin: true,
-        shadeClose: false, // 点击遮罩关闭层
-        area: ['800px', '520px'],
-        content: prefix + '/edit/' + id // iframe的url
-    });
-}
-function remove(id) {
-    layer.confirm('确定要删除选中的记录？', {
-        btn: ['确定', '取消']
-    }, function () {
-        $.ajax({
-            url: prefix + "/remove",
-            type: "post",
-            data: {
-                'id': id
-            },
-            success: function (r) {
-                if (r.code == 0) {
-                    layer.msg(r.msg);
-                    reLoad();
-                } else {
-                    layer.msg(r.msg);
-                }
-            }
-        });
-    })
-}
-
-function resetPwd(id) {
-}
-function batchRemove() {
-    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
-    if (rows.length == 0) {
-        layer.msg("请选择要删除的数据");
-        return;
-    }
-    layer.confirm("确认要删除选中的'" + rows.length + "'条数据吗?", {
-        btn: ['确定', '取消']
-        // 按钮
-    }, function () {
-        var ids = new Array();
-        // 遍历所有选择的行数据，取每条数据对应的ID
-        $.each(rows, function (i, row) {
-            ids[i] = row['id'];
-        });
-        $.ajax({
-            type: 'POST',
-            data: {
-                "ids": ids
-            },
-            url: prefix + '/batchRemove',
-            success: function (r) {
-                if (r.code == 0) {
-                    layer.msg(r.msg);
-                    reLoad();
-                } else {
-                    layer.msg(r.msg);
-                }
-            }
-        });
-    }, function () {
-
-    });
-}

novel-admin/src/main/resources/static/js/appjs/novel/book/edit.js

@@ -1,103 +0,0 @@
-var E = window.wangEditor;
-$("[id^='contentEditor']").each(function (index, ele) {
-    var relName = $(ele).attr("id").substring(13);
-    var editor = new E('#contentEditor' + relName);
-// 自定义菜单配置
-    editor.customConfig.menus = [
-        'head',  // 标题
-        'bold',  // 粗体
-        'fontSize',  // 字号
-        'fontName',  // 字体
-        'italic',  // 斜体
-        'underline',  // 下划线
-        'strikeThrough',  // 删除线
-        'foreColor',  // 文字颜色
-        //'backColor',  // 背景颜色
-        //'link',  // 插入链接
-        'list',  // 列表
-        'justify',  // 对齐方式
-        'quote',  // 引用
-        'emoticon',  // 表情
-        'image',  // 插入图片
-        //'table',  // 表格
-        //'video',  // 插入视频
-        //'code',  // 插入代码
-        'undo',  // 撤销
-        'redo'  // 重复
-    ];
-    editor.customConfig.onchange = function (html) {
-        // html 即变化之后的内容
-        $("#" + relName).val(html);
-    }
-    editor.customConfig.uploadImgShowBase64 = true;
-    editor.create();
-    editor.txt.html($("#" + relName).val());
-
-})
-
-$("[id^='picImage']").each(function (index, ele) {
-    var relName = $(ele).attr("id").substring(8);
-    layui.use('upload', function () {
-        var upload = layui.upload;
-        //执行实例
-        var uploadInst = upload.render({
-            elem: '#picImage' + relName, //绑定元素
-            url: '/common/sysFile/upload', //上传接口
-            size: 1000,
-            accept: 'file',
-            done: function (r) {
-                $("#picImage" + relName).attr("src", r.fileName);
-                $("#" + relName).val(r.fileName);
-            },
-            error: function (r) {
-                layer.msg(r.msg);
-            }
-        });
-    });
-
-});
-
-$().ready(function () {
-    validateRule();
-});
-
-$.validator.setDefaults({
-    submitHandler: function () {
-        update();
-    }
-});
-function update() {
-    $.ajax({
-        cache: true,
-        type: "POST",
-        url: "/novel/book/update",
-        data: $('#signupForm').serialize(),// 你的formid
-        async: false,
-        error: function (request) {
-            parent.layer.alert("Connection error");
-        },
-        success: function (data) {
-            if (data.code == 0) {
-                parent.layer.msg("操作成功");
-                parent.reLoad();
-                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
-                parent.layer.close(index);
-
-            } else {
-                parent.layer.alert(data.msg)
-            }
-
-        }
-    });
-
-}
-function validateRule() {
-    var icon = "<i class='fa fa-times-circle'></i> ";
-    $("#signupForm").validate({
-        ignore: "",
-        rules: {
-                                                                                                                                                                                                                                                                                                                },
-    messages: {
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                }
-})
-}

novel-admin/src/main/resources/static/sql/novel/book/menu.js

@@ -1,18 +0,0 @@
--- 菜单SQL
-INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
-    VALUES ('1', '小说表', 'novel/book', 'novel:book:book', '1', 'fa', '6');
-
--- 按钮父菜单ID
-set @parentId = @@identity;
-
--- 菜单对应按钮SQL
-INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
-    SELECT @parentId, '查看', null, 'novel:book:detail', '2', null, '6';
-INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
-    SELECT @parentId, '新增', null, 'novel:book:add', '2', null, '6';
-INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
-    SELECT @parentId, '修改', null, 'novel:book:edit', '2', null, '6';
-INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
-    SELECT @parentId, '删除', null, 'novel:book:remove', '2', null, '6';
-INSERT INTO `sys_menu` (`parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
-    SELECT @parentId, '批量删除', null, 'novel:book:batchRemove', '2', null, '6';

novel-admin/src/main/resources/templates/novel/book/add.html

@@ -1,252 +0,0 @@
-<!DOCTYPE html>
-<html>
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content ">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="ibox float-e-margins">
-                <div class="ibox-content">
-                    <form class="form-horizontal m-t" id="signupForm">
-                                                                                                                                        <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">作品方向，0：男频，1：女频：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="workDirection" name="workDirection"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">分类ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="catId" name="catId"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">分类名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="catName" name="catName"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">小说封面：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="picUrl" name="picUrl"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">小说名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="bookName" name="bookName"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">作者id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="authorId" name="authorId"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">作者名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="authorName" name="authorName"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">书籍描述：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="bookDesc" name="bookDesc"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">评分，预留字段：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="score" name="score"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">书籍状态，0：连载中，1：已完结：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="bookStatus" name="bookStatus"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">点击量：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="visitCount" name="visitCount"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">总字数：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="wordCount" name="wordCount"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">评论数：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="commentCount" name="commentCount"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最新目录ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="lastIndexId" name="lastIndexId"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最新目录名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="lastIndexName" name="lastIndexName"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最新目录更新时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="lastIndexUpdateTime"
-                                                   name="lastIndexUpdateTime"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">是否收费，1：收费，0：免费：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="isVip" name="isVip"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">状态，0：入库，1：上架：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="status" name="status"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">更新时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="updateTime"
-                                                   name="updateTime"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">创建时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="createTime"
-                                                   name="createTime"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">爬虫源站ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="crawlSourceId" name="crawlSourceId"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">抓取的源站小说ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="crawlBookId" name="crawlBookId"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最后一次的抓取时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="crawlLastTime"
-                                                   name="crawlLastTime"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                        
-                                    </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">是否已停止更新，0：未停止，1：已停止：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="crawlIsStop" name="crawlIsStop"
-                                                   class="form-control"
-                                                   type="text">
-                                        
-                                    </div>
-                                </div>
-                                                                            <div class="form-group">
-                            <div class="col-sm-8 col-sm-offset-3">
-                                <button type="submit" class="btn btn-primary">提交</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<div th:include="include::footer"></div>
-<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
-<script type="text/javascript" src="/js/appjs/novel/book/add.js">
-</script>
-</body>
-</html>

novel-admin/src/main/resources/templates/novel/book/book.html

@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html>
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content ">
-    <div class="col-sm-12">
-        <div class="ibox">
-            <div class="ibox-body">
-                <div class="fixed-table-toolbar">
-                    <div class="columns pull-left">
-                        <button shiro:hasPermission="novel:book:add" type="button"
-                                class="btn  btn-primary" onclick="add()">
-                            <i class="fa fa-plus" aria-hidden="true"></i>添加
-                        </button>
-                        <button shiro:hasPermission="novel:book:batchRemove" type="button"
-                                class="btn  btn-danger"
-                                onclick="batchRemove()">
-                            <i class="fa fa-trash" aria-hidden="true"></i>删除
-                        </button>
-                    </div>
-                    <div class="columns pull-right">
-                        <button class="btn btn-success" onclick="reLoad()">查询</button>
-                    </div>
-
-                    <form id="searchForm">
-                        <div class="columns pull-right col-md-2">
-                            <input id="id" name="id" type="text" class="form-control"
-                                   placeholder="主键">
-                        </div>
-                    </form>
-
-                </div>
-                <table id="exampleTable" data-mobile-responsive="true">
-                </table>
-            </div>
-        </div>
-    </div>
-</div>
-<!--shiro控制bootstraptable行内按钮看见性 -->
-<div>
-    <script type="text/javascript">
-        var s_detail_h = 'hidden';
-        var s_edit_h = 'hidden';
-        var s_remove_h = 'hidden';
-    </script>
-</div>
-<div shiro:hasPermission="test:order:detail">
-    <script type="text/javascript">
-        s_detail_h = '';
-    </script>
-</div>
-<div shiro:hasPermission="novel:book:edit">
-    <script type="text/javascript">
-        s_edit_h = '';
-    </script>
-</div>
-<div shiro:hasPermission="novel:book:remove">
-    <script type="text/javascript">
-        var s_remove_h = '';
-    </script>
-</div>
-<div th:include="include :: footer"></div>
-<script type="text/javascript" src="/js/appjs/novel/book/book.js"></script>
-</body>
-</html>

novel-admin/src/main/resources/templates/novel/book/detail.html

@@ -1,258 +0,0 @@
-<!DOCTYPE html>
-<html>
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content ">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="ibox float-e-margins">
-            <div class="ibox-content">
-            <form class="form-horizontal m-t" id="signupForm">
-                <input id="id" name="id" th:value="${book.id}"
-                       type="hidden">
-                                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">作品方向，0：男频，1：女频：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.workDirection}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">分类ID：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.catId}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">分类名：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.catName}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">小说封面：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.picUrl}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">小说名：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.bookName}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">作者id：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.authorId}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">作者名：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.authorName}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">书籍描述：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.bookDesc}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">评分，预留字段：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.score}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">书籍状态，0：连载中，1：已完结：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.bookStatus}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">点击量：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.visitCount}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">总字数：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.wordCount}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">评论数：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.commentCount}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">最新目录ID：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.lastIndexId}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">最新目录名：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.lastIndexName}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">最新目录更新时间：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.lastIndexUpdateTime}==null?null:${#dates.format(book.lastIndexUpdateTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">是否收费，1：收费，0：免费：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.isVip}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">状态，0：入库，1：上架：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.status}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">更新时间：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.updateTime}==null?null:${#dates.format(book.updateTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">创建时间：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.createTime}==null?null:${#dates.format(book.createTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">爬虫源站ID：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.crawlSourceId}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">抓取的源站小说ID：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.crawlBookId}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">最后一次的抓取时间：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.crawlLastTime}==null?null:${#dates.format(book.crawlLastTime,'yyyy-MM-dd HH:mm:ss')}">
-                            </div>
-                        
-
-                    </div>
-                                                                            <div class="form-group">
-                        <label class="col-sm-3 control-label">是否已停止更新，0：未停止，1：已停止：</label>
-
-                                                    <div style="padding-top:8px" class="col-sm-8"
-                                 th:text="${book.crawlIsStop}">
-                            </div>
-                        
-                        
-
-                    </div>
-                                                    </form>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-<div th:include="include::footer"></div>
-</body>
-</html>

novel-admin/src/main/resources/templates/novel/book/edit.html

@@ -1,254 +0,0 @@
-<!DOCTYPE html>
-<html>
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="gray-bg">
-<div class="wrapper wrapper-content ">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="ibox float-e-margins">
-                <div class="ibox-content">
-                    <form class="form-horizontal m-t" id="signupForm">
-                        <input id="id" name="id" th:value="${book.id}"
-                               type="hidden">
-                                                                                                                                        <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">作品方向，0：男频，1：女频：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="workDirection" name="workDirection"
-                                                   th:value="${book.workDirection}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">分类ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="catId" name="catId"
-                                                   th:value="${book.catId}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">分类名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="catName" name="catName"
-                                                   th:value="${book.catName}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">小说封面：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="picUrl" name="picUrl"
-                                                   th:value="${book.picUrl}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">小说名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="bookName" name="bookName"
-                                                   th:value="${book.bookName}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">作者id：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="authorId" name="authorId"
-                                                   th:value="${book.authorId}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">作者名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="authorName" name="authorName"
-                                                   th:value="${book.authorName}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">书籍描述：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="bookDesc" name="bookDesc"
-                                                   th:value="${book.bookDesc}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">评分，预留字段：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="score" name="score"
-                                                   th:value="${book.score}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">书籍状态，0：连载中，1：已完结：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="bookStatus" name="bookStatus"
-                                                   th:value="${book.bookStatus}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">点击量：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="visitCount" name="visitCount"
-                                                   th:value="${book.visitCount}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">总字数：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="wordCount" name="wordCount"
-                                                   th:value="${book.wordCount}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">评论数：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="commentCount" name="commentCount"
-                                                   th:value="${book.commentCount}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最新目录ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="lastIndexId" name="lastIndexId"
-                                                   th:value="${book.lastIndexId}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最新目录名：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="lastIndexName" name="lastIndexName"
-                                                   th:value="${book.lastIndexName}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最新目录更新时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="lastIndexUpdateTime"
-                                                   name="lastIndexUpdateTime"
-                                                   th:value="${book.lastIndexUpdateTime}==null?null:${#dates.format(book.lastIndexUpdateTime,'yyyy-MM-dd HH:mm:ss')}"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">是否收费，1：收费，0：免费：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="isVip" name="isVip"
-                                                   th:value="${book.isVip}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">状态，0：入库，1：上架：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="status" name="status"
-                                                   th:value="${book.status}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">更新时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="updateTime"
-                                                   name="updateTime"
-                                                   th:value="${book.updateTime}==null?null:${#dates.format(book.updateTime,'yyyy-MM-dd HH:mm:ss')}"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">创建时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="createTime"
-                                                   name="createTime"
-                                                   th:value="${book.createTime}==null?null:${#dates.format(book.createTime,'yyyy-MM-dd HH:mm:ss')}"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">爬虫源站ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="crawlSourceId" name="crawlSourceId"
-                                                   th:value="${book.crawlSourceId}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">抓取的源站小说ID：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="crawlBookId" name="crawlBookId"
-                                                   th:value="${book.crawlBookId}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">最后一次的抓取时间：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input type="text" class="laydate-icon layer-date form-control"
-                                                   id="crawlLastTime"
-                                                   name="crawlLastTime"
-                                                   th:value="${book.crawlLastTime}==null?null:${#dates.format(book.crawlLastTime,'yyyy-MM-dd HH:mm:ss')}"
-                                                   onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
-                                                   style="background-color: #fff;" readonly="readonly"/>
-                                                                            </div>
-                                </div>
-                                                                                                                <div class="form-group">
-                                                                            <label class="col-sm-3 control-label">是否已停止更新，0：未停止，1：已停止：</label>
-                                                                        <div class="col-sm-8">
-                                                                                    <input id="crawlIsStop" name="crawlIsStop"
-                                                   th:value="${book.crawlIsStop}"
-                                                   class="form-control"
-                                                   type="text">
-                                                                            </div>
-                                </div>
-                                                                            <div class="form-group">
-                            <div class="col-sm-8 col-sm-offset-3">
-                                <button type="submit" class="btn btn-primary">提交</button>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<div th:include="include::footer"></div>
-<script type="text/javascript" src="/wangEditor/release/wangEditor.js"></script>
-<script type="text/javascript" src="/js/appjs/novel/book/edit.js">
-</script>
-</body>
-</html>

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.0.1</version>
+        <version>2.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -31,11 +31,20 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
+
+        <!--ehcache-->
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
 
+        <!--集成redis-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-redis</artifactId>
+            <version>${redis.version}</version>
+        </dependency>
+
         <!--mysql驱动-->
         <dependency>
             <groupId>mysql</groupId>
@@ -48,6 +57,22 @@
             <version>${mybatis.version}</version>
         </dependency>
 
+        <!-- 分库分表-->
+        <!-- sharding jdbc依赖 -->
+
+        <dependency>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>${sharding.jdbc.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <version>${sharding.jdbc.version}</version>
+        </dependency>
+
+
         <!--分页助手启动器-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>
@@ -98,12 +123,7 @@
             <optional>true</optional>
         </dependency>
 
-        <!--druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.28</version>
-        </dependency>
+
 
     </dependencies>
 

novel-common/src/main/java/com/java2nb/novel/core/cache/CacheKey.java

@@ -46,4 +46,23 @@ public interface CacheKey {
      * */
     String RUNNING_CRAWL_THREAD_KEY_PREFIX = "runningCrawlTreadDataKeyPrefix";
 
+    /**
+     * 上一次搜索引擎更新的时间
+     * */
+    String ES_LAST_UPDATE_TIME = "esLastUpdateTime";
+
+    /**
+     * 搜索引擎转换锁
+     * */
+    String ES_TRANS_LOCK = "esTransLock";
+
+    /**
+     * 上一次搜索引擎是否更新过小说点击量
+     * */
+    String ES_IS_UPDATE_VISIT = "esIsUpdateVisit";
+
+    /**
+     * 累积的小说点击量
+     * */
+    String BOOK_ADD_VISIT_COUNT = "bookAddVisitCount";
 }

novel-common/src/main/java/com/java2nb/novel/core/cache/CacheService.java

@@ -51,9 +51,5 @@ public interface CacheService {
 	 * */
 	void expire(String key, long timeout);
 
-	/**
-	 * 刷新缓存
-	 * */
-	void refresh(String key);
 
 }

novel-common/src/main/java/com/java2nb/novel/core/cache/impl/EhCacheServiceImpl.java

@@ -1,24 +1,25 @@
 package com.java2nb.novel.core.cache.impl;
 
 import com.java2nb.novel.core.cache.CacheService;
+import lombok.RequiredArgsConstructor;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 
 /**
  * @author xxy
  */
+@ConditionalOnProperty(prefix = "cache", name = "type", havingValue = "ehcache")
+@RequiredArgsConstructor
 @Service
 public class EhCacheServiceImpl implements CacheService {
 	
-	@Autowired
-	private CacheManager cacheManager ;
+	private final CacheManager cacheManager ;
  
-	private static final String CACHE_NAME = "utilCache";
- 
-	
+
 	/**
 	 * 获得一个Cache，没有则创建一个。
 	 * @return
@@ -30,14 +31,6 @@ public class EhCacheServiceImpl implements CacheService {
 	}
 	
  
-	public  CacheManager getCacheManager() {
-		return cacheManager;
-	}
-	
-	
-
-
-
 	@Override
 	public String get(String key) {
 		Element element = getCache().get(key);
@@ -125,20 +118,6 @@ public class EhCacheServiceImpl implements CacheService {
 	}
 
 
-	@Override
-	public void refresh(String key) {
-		Element element = getCache().get(key);
-		if (element != null) {
-			Object value = element.getValue();
-			int timeToLive = element.getTimeToLive();
-			element = new Element(key, value);
-			element.setTimeToLive(timeToLive);
-			Cache cache = getCache();
-			cache.put(element);
-		}
-		
-	}
-
 
 
 }

novel-common/src/main/java/com/java2nb/novel/core/cache/impl/RedisServiceImpl.java

@@ -0,0 +1,73 @@
+package com.java2nb.novel.core.cache.impl;
+
+import com.java2nb.novel.core.cache.CacheService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author xxy
+ */
+@ConditionalOnProperty(prefix = "cache", name = "type", havingValue = "redis")
+@RequiredArgsConstructor
+@Service
+public class RedisServiceImpl implements CacheService {
+
+	private final StringRedisTemplate stringRedisTemplate;
+
+	private final RedisTemplate<Object,  Object>  redisTemplate;
+
+
+	@Override
+	public String get(String key) {
+		return stringRedisTemplate.opsForValue().get(key);
+	}
+
+	@Override
+	public void set(String key, String value) {
+		stringRedisTemplate.opsForValue().set(key,value);
+	}
+
+	@Override
+	public void set(String key, String value, long timeout) {
+		stringRedisTemplate.opsForValue().set(key,value,timeout, TimeUnit.SECONDS);
+
+	}
+
+	@Override
+	public Object getObject(String key) {
+		return redisTemplate.opsForValue().get(key);
+	}
+
+	@Override
+	public void setObject(String key, Object value) {
+		redisTemplate.opsForValue().set(key,value);
+	}
+
+	@Override
+	public void setObject(String key, Object value, long timeout) {
+		redisTemplate.opsForValue().set(key,value,timeout, TimeUnit.SECONDS);
+	}
+
+	@Override
+	public void del(String key) {
+		redisTemplate.delete(key);
+		stringRedisTemplate.delete(key);
+	}
+
+	@Override
+	public boolean contains(String key) {
+		return redisTemplate.hasKey(key) || stringRedisTemplate.hasKey(key);
+	}
+
+	@Override
+	public void expire(String key, long timeout) {
+		redisTemplate.expire(key,timeout, TimeUnit.SECONDS);
+		stringRedisTemplate.expire(key,timeout, TimeUnit.SECONDS);
+	}
+
+}

novel-common/src/main/java/com/java2nb/novel/core/converter/DateConverter.java

@@ -0,0 +1,62 @@
+package com.java2nb.novel.core.converter;
+
+import org.springframework.core.convert.converter.Converter;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 表单形式的全局时间类型转换器
+ * @author xiongxiaoyang
+ */
+public class DateConverter implements Converter<String, Date> {
+
+    private static final List<String> formats = new ArrayList<>(4);
+
+    static {
+        formats.add("yyyy-MM");
+        formats.add("yyyy-MM-dd");
+        formats.add("yyyy-MM-dd HH:mm");
+        formats.add("yyyy-MM-dd HH:mm:ss");
+    }
+
+    @Override
+    public Date convert(String source) {
+        String value = source.trim();
+        if ("".equals(value)) {
+            return null;
+        }
+        if (source.matches("^\\d{4}-\\d{1,2}$")) {
+            return parseDate(source, formats.get(0));
+        } else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2}$")) {
+            return parseDate(source, formats.get(1));
+        } else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}$")) {
+            return parseDate(source, formats.get(2));
+        } else if (source.matches("^\\d{4}-\\d{1,2}-\\d{1,2} {1}\\d{1,2}:\\d{1,2}:\\d{1,2}$")) {
+            return parseDate(source, formats.get(3));
+        } else {
+            throw new IllegalArgumentException("Invalid boolean value '" + source + "'");
+        }
+    }
+
+    /**
+     * 格式化日期
+     *
+     * @param dateStr String 字符型日期
+     * @param format  String 格式
+     * @return Date 日期
+     */
+    private Date parseDate(String dateStr, String format) {
+        Date date = null;
+        try {
+            DateFormat dateFormat = new SimpleDateFormat(format);
+            date = dateFormat.parse(dateStr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+}

novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java

@@ -55,9 +55,18 @@ public enum ResponseStatus {
      * */
     INVITE_CODE_INVALID(4001, "邀请码无效！"),
     AUTHOR_STATUS_FORBIDDEN(4002, "作者状态异常，暂不能管理小说！")
-    , BOOKNAME_EXISTS(4003,"已发布过同名小说！")
+    , BOOKNAME_EXISTS(4003,"已发布过同名小说！"),
 
-    ,
+    /**
+     * 小说相关错误
+     */
+    BOOK_EXISTS(5001,"该小说已存在")
+
+            ,
+    /**
+     * 搜索引擎相关错误
+     * */
+    ES_SEARCH_FAIL(9001,"搜索引擎查询错误！"),
 
 
     /**

novel-common/src/main/java/com/java2nb/novel/core/utils/DateUtil.java

@@ -0,0 +1,119 @@
+package com.java2nb.novel.core.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+/**
+ * 日期工具
+ * @author cd
+ */
+public class DateUtil {
+
+    public static final String DATE_PATTERN = "yyyy-MM-dd";
+    public static final String DATE_TIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String TIME_PATTERN = "HH:mm:ss";
+
+    /**
+     * 获取昨天的日期时间
+     * */
+    public static Date getYesterday(){
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.DATE, -1);
+        return calendar.getTime();
+    }
+
+    /**
+     * 根据日期，获取当天开始时间
+     * */
+    public static Date getDateStartTime(Date date){
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        /*
+        * Calendar.HOUR_OF_DAY:是指获取24小时制的小时,取值范围:0-23;
+        * Calendar.HOUR:是指获取12小时制的小时,取值范围:0-12,凌晨和中午都是0,不是12;
+        * 需要配合Calendar.AM_PM使用;
+        * */
+        calendar.set(Calendar.HOUR_OF_DAY,0);
+        calendar.set(Calendar.MINUTE,0);
+        calendar.set(Calendar.SECOND,0);
+        calendar.set(Calendar.MILLISECOND,0);
+        return calendar.getTime();
+    }
+
+    /**
+     * 根据日期，获取当天结束时间
+     * */
+    public static Date getDateEndTime(Date date){
+        Calendar calendar = new GregorianCalendar();
+        calendar.setTime(date);
+        calendar.set(Calendar.HOUR_OF_DAY,23);
+        calendar.set(Calendar.MINUTE,59);
+        calendar.set(Calendar.SECOND,59);
+        calendar.set(Calendar.MILLISECOND,999);
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取上个月开始时间
+     *
+     * @return
+     */
+    public static Date getLastMonthStartTime(){
+        // 获取当前日期
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.YEAR, 0);
+        calendar.add(Calendar.MONTH, -1);
+        // 设置为1号,当前日期既为本月第一天
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        return calendar.getTime();
+    }
+
+    /**
+     * 获取上个月结束时间
+     *
+     * @return
+     */
+    public static Date getLastMonthEndTime(){
+        // 获取当前日期
+        Calendar calendar = Calendar.getInstance();
+        calendar.add(Calendar.YEAR, 0);
+        calendar.add(Calendar.MONTH, -1);
+        // 获取当前月最后一天
+        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+        calendar.set(Calendar.HOUR_OF_DAY, 23);
+        calendar.set(Calendar.MINUTE, 59);
+        calendar.set(Calendar.SECOND, 59);
+        calendar.set(Calendar.MILLISECOND, 999);
+
+        return calendar.getTime();
+    }
+
+
+    /**
+     * 格式化日期
+     * */
+    public static String formatDate(Date date,String patten){
+
+        return new SimpleDateFormat(patten).format(date);
+    }
+
+
+    public static void main(String[] args) {
+        System.out.println(formatDate(getYesterday(),DATE_TIME_PATTERN));
+        System.out.println(formatDate(getDateStartTime(getYesterday()),DATE_TIME_PATTERN));
+        System.out.println(formatDate(getDateEndTime(getYesterday()),DATE_TIME_PATTERN));
+        System.out.println(formatDate(getLastMonthStartTime(),DATE_TIME_PATTERN));
+        System.out.println(formatDate(getLastMonthEndTime(),DATE_TIME_PATTERN));
+    }
+
+
+
+}

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;
     }
 

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) {

novel-common/src/main/java/com/java2nb/novel/core/utils/StringUtil.java

@@ -0,0 +1,156 @@
+package com.java2nb.novel.core.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.regex.Pattern.*;
+
+/**
+ * @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();
+    }
+
+    /**
+     * 获取字符串有效汉字
+     * */
+    public static String getChineseValidWord(String origStr){
+
+        //可以替换大部分空白字符， 不限于空格 . 说明:\s 可以匹配空格、制表符、换页符等空白字符的其中任意一个
+        origStr = origStr.replaceAll("\\s*","");
+
+       /* //完全清除标点
+        origStr = origStr.replaceAll("\\pP","");*/
+
+        //清除所有符号,只留下字母 数字  汉字  共3类.
+        origStr = origStr.replaceAll("[\\pP\\p{Punct}]","");
+
+        //去除字母和数字
+        origStr = origStr.replaceAll("[A-Za-z0-9]*","");
+
+        return origStr;
+
+    }
+
+    /**
+     * 获取字符串英文单词数量
+     * */
+    public static int getEnglishWordCount(String origStr){
+        Pattern pattern = compile("\\b\\w+\\b");
+        Matcher matcher = pattern.matcher(origStr);
+        int count = 0;
+        while (matcher.find()) {
+            count++;
+        }
+        return count;
+
+    }
+
+    /**
+     * 获取字符串中文汉字数量
+     * */
+    public static int getChineseWordCount(String origStr){
+        Pattern pattern = compile("[\u4e00-\u9fa5]");
+        Matcher matcher = pattern.matcher(origStr);
+        int count = 0;
+        while (matcher.find()) {
+            count++;
+        }
+        return count;
+
+    }
+
+    /**
+     * 获取字符串有效数字数量
+     * */
+    public static int getNumberWordCount(String origStr){
+        Pattern pattern = compile("\\d+");
+        Matcher matcher = pattern.matcher(origStr);
+        int count = 0;
+        while (matcher.find()) {
+            count++;
+        }
+        return count;
+
+    }
+
+    /**
+     * 获取字符串有效字数
+     * */
+    public static int getStrValidWordCount(String origStr){
+        return getChineseWordCount(origStr) + getEnglishWordCount(origStr) + getNumberWordCount(origStr);
+
+    }
+
+    public static void main(String[] args) {
+        String str = "Welcome to China. 你好呀！中国人，我是1123号程序员，     来给你服务23天. Hello Word";
+        System.out.println(getChineseWordCount(str));
+        System.out.println(getEnglishWordCount(str));
+        System.out.println(getNumberWordCount(str));
+    }
+
+
+}

novel-common/src/main/java/com/java2nb/novel/entity/AuthorIncome.java

@@ -0,0 +1,152 @@
+package com.java2nb.novel.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import javax.annotation.Generated;
+
+public class AuthorIncome {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long id;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long userId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long authorId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long bookId;
+
+    @JsonFormat(pattern = "yyyy年MM月", timezone = "GMT+8")
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Date incomeMonth;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long preTaxIncome;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long afterTaxIncome;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Byte payStatus;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Byte confirmStatus;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String detail;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Date createTime;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getId() {
+        return id;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getAuthorId() {
+        return authorId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setAuthorId(Long authorId) {
+        this.authorId = authorId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getBookId() {
+        return bookId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Date getIncomeMonth() {
+        return incomeMonth;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setIncomeMonth(Date incomeMonth) {
+        this.incomeMonth = incomeMonth;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getPreTaxIncome() {
+        return preTaxIncome;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setPreTaxIncome(Long preTaxIncome) {
+        this.preTaxIncome = preTaxIncome;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getAfterTaxIncome() {
+        return afterTaxIncome;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setAfterTaxIncome(Long afterTaxIncome) {
+        this.afterTaxIncome = afterTaxIncome;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Byte getPayStatus() {
+        return payStatus;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setPayStatus(Byte payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Byte getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setConfirmStatus(Byte confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getDetail() {
+        return detail;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setDetail(String detail) {
+        this.detail = detail == null ? null : detail.trim();
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

novel-common/src/main/java/com/java2nb/novel/entity/AuthorIncomeDetail.java

@@ -0,0 +1,126 @@
+package com.java2nb.novel.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+import javax.annotation.Generated;
+
+public class AuthorIncomeDetail {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long id;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long userId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long authorId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Long bookId;
+
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Date incomeDate;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Integer incomeAccount;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Integer incomeCount;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Integer incomeNumber;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Date createTime;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getId() {
+        return id;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getAuthorId() {
+        return authorId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setAuthorId(Long authorId) {
+        this.authorId = authorId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Long getBookId() {
+        return bookId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Date getIncomeDate() {
+        return incomeDate;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setIncomeDate(Date incomeDate) {
+        this.incomeDate = incomeDate;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Integer getIncomeAccount() {
+        return incomeAccount;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setIncomeAccount(Integer incomeAccount) {
+        this.incomeAccount = incomeAccount;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Integer getIncomeCount() {
+        return incomeCount;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setIncomeCount(Integer incomeCount) {
+        this.incomeCount = incomeCount;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Integer getIncomeNumber() {
+        return incomeNumber;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setIncomeNumber(Integer incomeNumber) {
+        this.incomeNumber = incomeNumber;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

novel-common/src/main/java/com/java2nb/novel/entity/Book.java

@@ -47,6 +47,9 @@ public class Book implements Serializable{
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Integer commentCount;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Integer yesterdayBuy;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long lastIndexId;
 
@@ -220,6 +223,16 @@ public class Book implements Serializable{
         this.commentCount = commentCount;
     }
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Integer getYesterdayBuy() {
+        return yesterdayBuy;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setYesterdayBuy(Integer yesterdayBuy) {
+        this.yesterdayBuy = yesterdayBuy;
+    }
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public Long getLastIndexId() {
         return lastIndexId;

novel-common/src/main/java/com/java2nb/novel/entity/BookIndex.java

@@ -22,6 +22,9 @@ public class BookIndex {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte isVip;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Integer bookPrice;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date createTime;
 
@@ -88,6 +91,16 @@ public class BookIndex {
         this.isVip = isVip;
     }
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Integer getBookPrice() {
+        return bookPrice;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setBookPrice(Integer bookPrice) {
+        this.bookPrice = bookPrice;
+    }
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public Date getCreateTime() {
         return createTime;

novel-common/src/main/java/com/java2nb/novel/entity/CrawlSingleTask.java

@@ -10,9 +10,21 @@ public class CrawlSingleTask {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Integer sourceId;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String sourceName;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String sourceBookId;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private Integer catId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String bookName;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    private String authorName;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte taskStatus;
 
@@ -42,6 +54,16 @@ public class CrawlSingleTask {
         this.sourceId = sourceId;
     }
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName == null ? null : sourceName.trim();
+    }
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public String getSourceBookId() {
         return sourceBookId;
@@ -52,6 +74,36 @@ public class CrawlSingleTask {
         this.sourceBookId = sourceBookId == null ? null : sourceBookId.trim();
     }
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public Integer getCatId() {
+        return catId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setCatId(Integer catId) {
+        this.catId = catId;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getBookName() {
+        return bookName;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setBookName(String bookName) {
+        this.bookName = bookName == null ? null : bookName.trim();
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public String getAuthorName() {
+        return authorName;
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public void setAuthorName(String authorName) {
+        this.authorName = authorName == null ? null : authorName.trim();
+    }
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public Byte getTaskStatus() {
         return taskStatus;

novel-common/src/main/java/com/java2nb/novel/mapper/AuthorIncomeDetailDynamicSqlSupport.java

@@ -0,0 +1,64 @@
+package com.java2nb.novel.mapper;
+
+import java.sql.JDBCType;
+import java.util.Date;
+import javax.annotation.Generated;
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+
+public final class AuthorIncomeDetailDynamicSqlSupport {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final AuthorIncomeDetail authorIncomeDetail = new AuthorIncomeDetail();
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> id = authorIncomeDetail.id;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> userId = authorIncomeDetail.userId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> authorId = authorIncomeDetail.authorId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> bookId = authorIncomeDetail.bookId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Date> incomeDate = authorIncomeDetail.incomeDate;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Integer> incomeAccount = authorIncomeDetail.incomeAccount;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Integer> incomeCount = authorIncomeDetail.incomeCount;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Integer> incomeNumber = authorIncomeDetail.incomeNumber;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Date> createTime = authorIncomeDetail.createTime;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final class AuthorIncomeDetail extends SqlTable {
+        public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> userId = column("user_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> authorId = column("author_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> bookId = column("book_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Date> incomeDate = column("income_date", JDBCType.DATE);
+
+        public final SqlColumn<Integer> incomeAccount = column("income_account", JDBCType.INTEGER);
+
+        public final SqlColumn<Integer> incomeCount = column("income_count", JDBCType.INTEGER);
+
+        public final SqlColumn<Integer> incomeNumber = column("income_number", JDBCType.INTEGER);
+
+        public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
+
+        public AuthorIncomeDetail() {
+            super("author_income_detail");
+        }
+    }
+}

novel-common/src/main/java/com/java2nb/novel/mapper/AuthorIncomeDetailMapper.java

@@ -0,0 +1,222 @@
+package com.java2nb.novel.mapper;
+
+import static com.java2nb.novel.mapper.AuthorIncomeDetailDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.*;
+
+import com.java2nb.novel.entity.AuthorIncomeDetail;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Generated;
+
+import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
+import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
+import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
+import org.mybatis.dynamic.sql.select.CountDSLCompleter;
+import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
+import org.mybatis.dynamic.sql.update.UpdateModel;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
+
+@Mapper
+public interface AuthorIncomeDetailMapper {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    BasicColumn[] selectList = BasicColumn.columnList(id, userId, authorId, bookId, incomeDate, incomeAccount, incomeCount, incomeNumber, createTime);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    long count(SelectStatementProvider selectStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
+    int delete(DeleteStatementProvider deleteStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
+    int insert(InsertStatementProvider<AuthorIncomeDetail> insertStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @InsertProvider(type=SqlProviderAdapter.class, method="insertMultiple")
+    int insertMultiple(MultiRowInsertStatementProvider<AuthorIncomeDetail> multipleInsertStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("AuthorIncomeDetailResult")
+    Optional<AuthorIncomeDetail> selectOne(SelectStatementProvider selectStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @Results(id="AuthorIncomeDetailResult", value = {
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+        @Result(column="author_id", property="authorId", jdbcType=JdbcType.BIGINT),
+        @Result(column="book_id", property="bookId", jdbcType=JdbcType.BIGINT),
+        @Result(column="income_date", property="incomeDate", jdbcType=JdbcType.DATE),
+        @Result(column="income_account", property="incomeAccount", jdbcType=JdbcType.INTEGER),
+        @Result(column="income_count", property="incomeCount", jdbcType=JdbcType.INTEGER),
+        @Result(column="income_number", property="incomeNumber", jdbcType=JdbcType.INTEGER),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP)
+    })
+    List<AuthorIncomeDetail> selectMany(SelectStatementProvider selectStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
+    int update(UpdateStatementProvider updateStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default long count(CountDSLCompleter completer) {
+        return MyBatis3Utils.countFrom(this::count, authorIncomeDetail, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int delete(DeleteDSLCompleter completer) {
+        return MyBatis3Utils.deleteFrom(this::delete, authorIncomeDetail, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int deleteByPrimaryKey(Long id_) {
+        return delete(c -> 
+            c.where(id, isEqualTo(id_))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int insert(AuthorIncomeDetail record) {
+        return MyBatis3Utils.insert(this::insert, record, authorIncomeDetail, c ->
+            c.map(id).toProperty("id")
+            .map(userId).toProperty("userId")
+            .map(authorId).toProperty("authorId")
+            .map(bookId).toProperty("bookId")
+            .map(incomeDate).toProperty("incomeDate")
+            .map(incomeAccount).toProperty("incomeAccount")
+            .map(incomeCount).toProperty("incomeCount")
+            .map(incomeNumber).toProperty("incomeNumber")
+            .map(createTime).toProperty("createTime")
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int insertMultiple(Collection<AuthorIncomeDetail> records) {
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, authorIncomeDetail, c ->
+            c.map(id).toProperty("id")
+            .map(userId).toProperty("userId")
+            .map(authorId).toProperty("authorId")
+            .map(bookId).toProperty("bookId")
+            .map(incomeDate).toProperty("incomeDate")
+            .map(incomeAccount).toProperty("incomeAccount")
+            .map(incomeCount).toProperty("incomeCount")
+            .map(incomeNumber).toProperty("incomeNumber")
+            .map(createTime).toProperty("createTime")
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int insertSelective(AuthorIncomeDetail record) {
+        return MyBatis3Utils.insert(this::insert, record, authorIncomeDetail, c ->
+            c.map(id).toPropertyWhenPresent("id", record::getId)
+            .map(userId).toPropertyWhenPresent("userId", record::getUserId)
+            .map(authorId).toPropertyWhenPresent("authorId", record::getAuthorId)
+            .map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
+            .map(incomeDate).toPropertyWhenPresent("incomeDate", record::getIncomeDate)
+            .map(incomeAccount).toPropertyWhenPresent("incomeAccount", record::getIncomeAccount)
+            .map(incomeCount).toPropertyWhenPresent("incomeCount", record::getIncomeCount)
+            .map(incomeNumber).toPropertyWhenPresent("incomeNumber", record::getIncomeNumber)
+            .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default Optional<AuthorIncomeDetail> selectOne(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, authorIncomeDetail, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default List<AuthorIncomeDetail> select(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectList(this::selectMany, selectList, authorIncomeDetail, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default List<AuthorIncomeDetail> selectDistinct(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, authorIncomeDetail, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default Optional<AuthorIncomeDetail> selectByPrimaryKey(Long id_) {
+        return selectOne(c ->
+            c.where(id, isEqualTo(id_))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int update(UpdateDSLCompleter completer) {
+        return MyBatis3Utils.update(this::update, authorIncomeDetail, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    static UpdateDSL<UpdateModel> updateAllColumns(AuthorIncomeDetail record, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(id).equalTo(record::getId)
+                .set(userId).equalTo(record::getUserId)
+                .set(authorId).equalTo(record::getAuthorId)
+                .set(bookId).equalTo(record::getBookId)
+                .set(incomeDate).equalTo(record::getIncomeDate)
+                .set(incomeAccount).equalTo(record::getIncomeAccount)
+                .set(incomeCount).equalTo(record::getIncomeCount)
+                .set(incomeNumber).equalTo(record::getIncomeNumber)
+                .set(createTime).equalTo(record::getCreateTime);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(AuthorIncomeDetail record, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(id).equalToWhenPresent(record::getId)
+                .set(userId).equalToWhenPresent(record::getUserId)
+                .set(authorId).equalToWhenPresent(record::getAuthorId)
+                .set(bookId).equalToWhenPresent(record::getBookId)
+                .set(incomeDate).equalToWhenPresent(record::getIncomeDate)
+                .set(incomeAccount).equalToWhenPresent(record::getIncomeAccount)
+                .set(incomeCount).equalToWhenPresent(record::getIncomeCount)
+                .set(incomeNumber).equalToWhenPresent(record::getIncomeNumber)
+                .set(createTime).equalToWhenPresent(record::getCreateTime);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int updateByPrimaryKey(AuthorIncomeDetail record) {
+        return update(c ->
+            c.set(userId).equalTo(record::getUserId)
+            .set(authorId).equalTo(record::getAuthorId)
+            .set(bookId).equalTo(record::getBookId)
+            .set(incomeDate).equalTo(record::getIncomeDate)
+            .set(incomeAccount).equalTo(record::getIncomeAccount)
+            .set(incomeCount).equalTo(record::getIncomeCount)
+            .set(incomeNumber).equalTo(record::getIncomeNumber)
+            .set(createTime).equalTo(record::getCreateTime)
+            .where(id, isEqualTo(record::getId))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int updateByPrimaryKeySelective(AuthorIncomeDetail record) {
+        return update(c ->
+            c.set(userId).equalToWhenPresent(record::getUserId)
+            .set(authorId).equalToWhenPresent(record::getAuthorId)
+            .set(bookId).equalToWhenPresent(record::getBookId)
+            .set(incomeDate).equalToWhenPresent(record::getIncomeDate)
+            .set(incomeAccount).equalToWhenPresent(record::getIncomeAccount)
+            .set(incomeCount).equalToWhenPresent(record::getIncomeCount)
+            .set(incomeNumber).equalToWhenPresent(record::getIncomeNumber)
+            .set(createTime).equalToWhenPresent(record::getCreateTime)
+            .where(id, isEqualTo(record::getId))
+        );
+    }
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultType(value = Long.class)
+    Long selectStatistic(SelectStatementProvider selectStatement);
+}

novel-common/src/main/java/com/java2nb/novel/mapper/AuthorIncomeDynamicSqlSupport.java

@@ -0,0 +1,74 @@
+package com.java2nb.novel.mapper;
+
+import java.sql.JDBCType;
+import java.util.Date;
+import javax.annotation.Generated;
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.SqlTable;
+
+public final class AuthorIncomeDynamicSqlSupport {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final AuthorIncome authorIncome = new AuthorIncome();
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> id = authorIncome.id;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> userId = authorIncome.userId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> authorId = authorIncome.authorId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> bookId = authorIncome.bookId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Date> incomeMonth = authorIncome.incomeMonth;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> preTaxIncome = authorIncome.preTaxIncome;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Long> afterTaxIncome = authorIncome.afterTaxIncome;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Byte> payStatus = authorIncome.payStatus;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Byte> confirmStatus = authorIncome.confirmStatus;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<String> detail = authorIncome.detail;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Date> createTime = authorIncome.createTime;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final class AuthorIncome extends SqlTable {
+        public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> userId = column("user_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> authorId = column("author_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> bookId = column("book_id", JDBCType.BIGINT);
+
+        public final SqlColumn<Date> incomeMonth = column("income_month", JDBCType.DATE);
+
+        public final SqlColumn<Long> preTaxIncome = column("pre_tax_income", JDBCType.BIGINT);
+
+        public final SqlColumn<Long> afterTaxIncome = column("after_tax_income", JDBCType.BIGINT);
+
+        public final SqlColumn<Byte> payStatus = column("pay_status", JDBCType.TINYINT);
+
+        public final SqlColumn<Byte> confirmStatus = column("confirm_status", JDBCType.TINYINT);
+
+        public final SqlColumn<String> detail = column("detail", JDBCType.VARCHAR);
+
+        public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
+
+        public AuthorIncome() {
+            super("author_income");
+        }
+    }
+}

novel-common/src/main/java/com/java2nb/novel/mapper/AuthorIncomeMapper.java

@@ -0,0 +1,240 @@
+package com.java2nb.novel.mapper;
+
+import static com.java2nb.novel.mapper.AuthorIncomeDynamicSqlSupport.*;
+import static org.mybatis.dynamic.sql.SqlBuilder.*;
+
+import com.java2nb.novel.entity.AuthorIncome;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Generated;
+import org.apache.ibatis.annotations.DeleteProvider;
+import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Result;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Results;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.UpdateProvider;
+import org.apache.ibatis.type.JdbcType;
+import org.mybatis.dynamic.sql.BasicColumn;
+import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
+import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
+import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
+import org.mybatis.dynamic.sql.select.CountDSLCompleter;
+import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
+import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.mybatis.dynamic.sql.update.UpdateDSL;
+import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
+import org.mybatis.dynamic.sql.update.UpdateModel;
+import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
+import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
+import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
+
+@Mapper
+public interface AuthorIncomeMapper {
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    BasicColumn[] selectList = BasicColumn.columnList(id, userId, authorId, bookId, incomeMonth, preTaxIncome, afterTaxIncome, payStatus, confirmStatus, detail, createTime);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    long count(SelectStatementProvider selectStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
+    int delete(DeleteStatementProvider deleteStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
+    int insert(InsertStatementProvider<AuthorIncome> insertStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @InsertProvider(type=SqlProviderAdapter.class, method="insertMultiple")
+    int insertMultiple(MultiRowInsertStatementProvider<AuthorIncome> multipleInsertStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultMap("AuthorIncomeResult")
+    Optional<AuthorIncome> selectOne(SelectStatementProvider selectStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @Results(id="AuthorIncomeResult", value = {
+        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
+        @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
+        @Result(column="author_id", property="authorId", jdbcType=JdbcType.BIGINT),
+        @Result(column="book_id", property="bookId", jdbcType=JdbcType.BIGINT),
+        @Result(column="income_month", property="incomeMonth", jdbcType=JdbcType.DATE),
+        @Result(column="pre_tax_income", property="preTaxIncome", jdbcType=JdbcType.BIGINT),
+        @Result(column="after_tax_income", property="afterTaxIncome", jdbcType=JdbcType.BIGINT),
+        @Result(column="pay_status", property="payStatus", jdbcType=JdbcType.TINYINT),
+        @Result(column="confirm_status", property="confirmStatus", jdbcType=JdbcType.TINYINT),
+        @Result(column="detail", property="detail", jdbcType=JdbcType.VARCHAR),
+        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP)
+    })
+    List<AuthorIncome> selectMany(SelectStatementProvider selectStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
+    int update(UpdateStatementProvider updateStatement);
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default long count(CountDSLCompleter completer) {
+        return MyBatis3Utils.countFrom(this::count, authorIncome, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int delete(DeleteDSLCompleter completer) {
+        return MyBatis3Utils.deleteFrom(this::delete, authorIncome, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int deleteByPrimaryKey(Long id_) {
+        return delete(c -> 
+            c.where(id, isEqualTo(id_))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int insert(AuthorIncome record) {
+        return MyBatis3Utils.insert(this::insert, record, authorIncome, c ->
+            c.map(id).toProperty("id")
+            .map(userId).toProperty("userId")
+            .map(authorId).toProperty("authorId")
+            .map(bookId).toProperty("bookId")
+            .map(incomeMonth).toProperty("incomeMonth")
+            .map(preTaxIncome).toProperty("preTaxIncome")
+            .map(afterTaxIncome).toProperty("afterTaxIncome")
+            .map(payStatus).toProperty("payStatus")
+            .map(confirmStatus).toProperty("confirmStatus")
+            .map(detail).toProperty("detail")
+            .map(createTime).toProperty("createTime")
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int insertMultiple(Collection<AuthorIncome> records) {
+        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, authorIncome, c ->
+            c.map(id).toProperty("id")
+            .map(userId).toProperty("userId")
+            .map(authorId).toProperty("authorId")
+            .map(bookId).toProperty("bookId")
+            .map(incomeMonth).toProperty("incomeMonth")
+            .map(preTaxIncome).toProperty("preTaxIncome")
+            .map(afterTaxIncome).toProperty("afterTaxIncome")
+            .map(payStatus).toProperty("payStatus")
+            .map(confirmStatus).toProperty("confirmStatus")
+            .map(detail).toProperty("detail")
+            .map(createTime).toProperty("createTime")
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int insertSelective(AuthorIncome record) {
+        return MyBatis3Utils.insert(this::insert, record, authorIncome, c ->
+            c.map(id).toPropertyWhenPresent("id", record::getId)
+            .map(userId).toPropertyWhenPresent("userId", record::getUserId)
+            .map(authorId).toPropertyWhenPresent("authorId", record::getAuthorId)
+            .map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
+            .map(incomeMonth).toPropertyWhenPresent("incomeMonth", record::getIncomeMonth)
+            .map(preTaxIncome).toPropertyWhenPresent("preTaxIncome", record::getPreTaxIncome)
+            .map(afterTaxIncome).toPropertyWhenPresent("afterTaxIncome", record::getAfterTaxIncome)
+            .map(payStatus).toPropertyWhenPresent("payStatus", record::getPayStatus)
+            .map(confirmStatus).toPropertyWhenPresent("confirmStatus", record::getConfirmStatus)
+            .map(detail).toPropertyWhenPresent("detail", record::getDetail)
+            .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default Optional<AuthorIncome> selectOne(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectOne(this::selectOne, selectList, authorIncome, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default List<AuthorIncome> select(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectList(this::selectMany, selectList, authorIncome, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default List<AuthorIncome> selectDistinct(SelectDSLCompleter completer) {
+        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, authorIncome, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default Optional<AuthorIncome> selectByPrimaryKey(Long id_) {
+        return selectOne(c ->
+            c.where(id, isEqualTo(id_))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int update(UpdateDSLCompleter completer) {
+        return MyBatis3Utils.update(this::update, authorIncome, completer);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    static UpdateDSL<UpdateModel> updateAllColumns(AuthorIncome record, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(id).equalTo(record::getId)
+                .set(userId).equalTo(record::getUserId)
+                .set(authorId).equalTo(record::getAuthorId)
+                .set(bookId).equalTo(record::getBookId)
+                .set(incomeMonth).equalTo(record::getIncomeMonth)
+                .set(preTaxIncome).equalTo(record::getPreTaxIncome)
+                .set(afterTaxIncome).equalTo(record::getAfterTaxIncome)
+                .set(payStatus).equalTo(record::getPayStatus)
+                .set(confirmStatus).equalTo(record::getConfirmStatus)
+                .set(detail).equalTo(record::getDetail)
+                .set(createTime).equalTo(record::getCreateTime);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(AuthorIncome record, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(id).equalToWhenPresent(record::getId)
+                .set(userId).equalToWhenPresent(record::getUserId)
+                .set(authorId).equalToWhenPresent(record::getAuthorId)
+                .set(bookId).equalToWhenPresent(record::getBookId)
+                .set(incomeMonth).equalToWhenPresent(record::getIncomeMonth)
+                .set(preTaxIncome).equalToWhenPresent(record::getPreTaxIncome)
+                .set(afterTaxIncome).equalToWhenPresent(record::getAfterTaxIncome)
+                .set(payStatus).equalToWhenPresent(record::getPayStatus)
+                .set(confirmStatus).equalToWhenPresent(record::getConfirmStatus)
+                .set(detail).equalToWhenPresent(record::getDetail)
+                .set(createTime).equalToWhenPresent(record::getCreateTime);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int updateByPrimaryKey(AuthorIncome record) {
+        return update(c ->
+            c.set(userId).equalTo(record::getUserId)
+            .set(authorId).equalTo(record::getAuthorId)
+            .set(bookId).equalTo(record::getBookId)
+            .set(incomeMonth).equalTo(record::getIncomeMonth)
+            .set(preTaxIncome).equalTo(record::getPreTaxIncome)
+            .set(afterTaxIncome).equalTo(record::getAfterTaxIncome)
+            .set(payStatus).equalTo(record::getPayStatus)
+            .set(confirmStatus).equalTo(record::getConfirmStatus)
+            .set(detail).equalTo(record::getDetail)
+            .set(createTime).equalTo(record::getCreateTime)
+            .where(id, isEqualTo(record::getId))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int updateByPrimaryKeySelective(AuthorIncome record) {
+        return update(c ->
+            c.set(userId).equalToWhenPresent(record::getUserId)
+            .set(authorId).equalToWhenPresent(record::getAuthorId)
+            .set(bookId).equalToWhenPresent(record::getBookId)
+            .set(incomeMonth).equalToWhenPresent(record::getIncomeMonth)
+            .set(preTaxIncome).equalToWhenPresent(record::getPreTaxIncome)
+            .set(afterTaxIncome).equalToWhenPresent(record::getAfterTaxIncome)
+            .set(payStatus).equalToWhenPresent(record::getPayStatus)
+            .set(confirmStatus).equalToWhenPresent(record::getConfirmStatus)
+            .set(detail).equalToWhenPresent(record::getDetail)
+            .set(createTime).equalToWhenPresent(record::getCreateTime)
+            .where(id, isEqualTo(record::getId))
+        );
+    }
+}

novel-common/src/main/java/com/java2nb/novel/mapper/BookContentDynamicSqlSupport.java

@@ -24,7 +24,7 @@ public final class BookContentDynamicSqlSupport {
 
         public final SqlColumn<Long> indexId = column("index_id", JDBCType.BIGINT);
 
-        public final SqlColumn<String> content = column("content", JDBCType.LONGVARCHAR);
+        public final SqlColumn<String> content = column("content", JDBCType.VARCHAR);
 
         public BookContent() {
             super("book_content");

novel-common/src/main/java/com/java2nb/novel/mapper/BookContentMapper.java

@@ -63,7 +63,7 @@ public interface BookContentMapper {
     @Results(id="BookContentResult", value = {
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="index_id", property="indexId", jdbcType=JdbcType.BIGINT),
-        @Result(column="content", property="content", jdbcType=JdbcType.LONGVARCHAR)
+        @Result(column="content", property="content", jdbcType=JdbcType.VARCHAR)
     })
     List<BookContent> selectMany(SelectStatementProvider selectStatement);
 

novel-common/src/main/java/com/java2nb/novel/mapper/BookDynamicSqlSupport.java

@@ -52,6 +52,9 @@ public final class BookDynamicSqlSupport {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Integer> commentCount = book.commentCount;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Integer> yesterdayBuy = book.yesterdayBuy;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Long> lastIndexId = book.lastIndexId;
 
@@ -115,6 +118,8 @@ public final class BookDynamicSqlSupport {
 
         public final SqlColumn<Integer> commentCount = column("comment_count", JDBCType.INTEGER);
 
+        public final SqlColumn<Integer> yesterdayBuy = column("yesterday_buy", JDBCType.INTEGER);
+
         public final SqlColumn<Long> lastIndexId = column("last_index_id", JDBCType.BIGINT);
 
         public final SqlColumn<String> lastIndexName = column("last_index_name", JDBCType.VARCHAR);

novel-common/src/main/java/com/java2nb/novel/mapper/BookIndexDynamicSqlSupport.java

@@ -28,6 +28,9 @@ public final class BookIndexDynamicSqlSupport {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Byte> isVip = bookIndex.isVip;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Integer> bookPrice = bookIndex.bookPrice;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Date> createTime = bookIndex.createTime;
 
@@ -48,6 +51,8 @@ public final class BookIndexDynamicSqlSupport {
 
         public final SqlColumn<Byte> isVip = column("is_vip", JDBCType.TINYINT);
 
+        public final SqlColumn<Integer> bookPrice = column("book_price", JDBCType.INTEGER);
+
         public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
 
         public final SqlColumn<Date> updateTime = column("update_time", JDBCType.TIMESTAMP);

novel-common/src/main/java/com/java2nb/novel/mapper/BookIndexMapper.java

@@ -4,10 +4,12 @@ import static com.java2nb.novel.mapper.BookIndexDynamicSqlSupport.*;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import com.java2nb.novel.entity.BookIndex;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Generated;
+
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,45 +37,46 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 @Mapper
 public interface BookIndexMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, bookId, indexNum, indexName, wordCount, isVip, createTime, updateTime);
+    BasicColumn[] selectList = BasicColumn.columnList(id, bookId, indexNum, indexName, wordCount, isVip, bookPrice, createTime, updateTime);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
     long count(SelectStatementProvider selectStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
+    @DeleteProvider(type = SqlProviderAdapter.class, method = "delete")
     int delete(DeleteStatementProvider deleteStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
+    @InsertProvider(type = SqlProviderAdapter.class, method = "insert")
     int insert(InsertStatementProvider<BookIndex> insertStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @InsertProvider(type=SqlProviderAdapter.class, method="insertMultiple")
+    @InsertProvider(type = SqlProviderAdapter.class, method = "insertMultiple")
     int insertMultiple(MultiRowInsertStatementProvider<BookIndex> multipleInsertStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
     @ResultMap("BookIndexResult")
     Optional<BookIndex> selectOne(SelectStatementProvider selectStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results(id="BookIndexResult", value = {
-        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
-        @Result(column="book_id", property="bookId", jdbcType=JdbcType.BIGINT),
-        @Result(column="index_num", property="indexNum", jdbcType=JdbcType.INTEGER),
-        @Result(column="index_name", property="indexName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="word_count", property="wordCount", jdbcType=JdbcType.INTEGER),
-        @Result(column="is_vip", property="isVip", jdbcType=JdbcType.TINYINT),
-        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP)
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
+    @Results(id = "BookIndexResult", value = {
+            @Result(column = "id", property = "id", jdbcType = JdbcType.BIGINT, id = true),
+            @Result(column = "book_id", property = "bookId", jdbcType = JdbcType.BIGINT),
+            @Result(column = "index_num", property = "indexNum", jdbcType = JdbcType.INTEGER),
+            @Result(column = "index_name", property = "indexName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "word_count", property = "wordCount", jdbcType = JdbcType.INTEGER),
+            @Result(column = "is_vip", property = "isVip", jdbcType = JdbcType.TINYINT),
+            @Result(column = "book_price", property = "bookPrice", jdbcType = JdbcType.INTEGER),
+            @Result(column = "create_time", property = "createTime", jdbcType = JdbcType.TIMESTAMP),
+            @Result(column = "update_time", property = "updateTime", jdbcType = JdbcType.TIMESTAMP)
     })
     List<BookIndex> selectMany(SelectStatementProvider selectStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
+    @UpdateProvider(type = SqlProviderAdapter.class, method = "update")
     int update(UpdateStatementProvider updateStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
@@ -88,50 +91,53 @@ public interface BookIndexMapper {
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int deleteByPrimaryKey(Long id_) {
-        return delete(c -> 
-            c.where(id, isEqualTo(id_))
+        return delete(c ->
+                c.where(id, isEqualTo(id_))
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int insert(BookIndex record) {
         return MyBatis3Utils.insert(this::insert, record, bookIndex, c ->
-            c.map(id).toProperty("id")
-            .map(bookId).toProperty("bookId")
-            .map(indexNum).toProperty("indexNum")
-            .map(indexName).toProperty("indexName")
-            .map(wordCount).toProperty("wordCount")
-            .map(isVip).toProperty("isVip")
-            .map(createTime).toProperty("createTime")
-            .map(updateTime).toProperty("updateTime")
+                c.map(id).toProperty("id")
+                        .map(bookId).toProperty("bookId")
+                        .map(indexNum).toProperty("indexNum")
+                        .map(indexName).toProperty("indexName")
+                        .map(wordCount).toProperty("wordCount")
+                        .map(isVip).toProperty("isVip")
+                        .map(bookPrice).toProperty("bookPrice")
+                        .map(createTime).toProperty("createTime")
+                        .map(updateTime).toProperty("updateTime")
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int insertMultiple(Collection<BookIndex> records) {
         return MyBatis3Utils.insertMultiple(this::insertMultiple, records, bookIndex, c ->
-            c.map(id).toProperty("id")
-            .map(bookId).toProperty("bookId")
-            .map(indexNum).toProperty("indexNum")
-            .map(indexName).toProperty("indexName")
-            .map(wordCount).toProperty("wordCount")
-            .map(isVip).toProperty("isVip")
-            .map(createTime).toProperty("createTime")
-            .map(updateTime).toProperty("updateTime")
+                c.map(id).toProperty("id")
+                        .map(bookId).toProperty("bookId")
+                        .map(indexNum).toProperty("indexNum")
+                        .map(indexName).toProperty("indexName")
+                        .map(wordCount).toProperty("wordCount")
+                        .map(isVip).toProperty("isVip")
+                        .map(bookPrice).toProperty("bookPrice")
+                        .map(createTime).toProperty("createTime")
+                        .map(updateTime).toProperty("updateTime")
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int insertSelective(BookIndex record) {
         return MyBatis3Utils.insert(this::insert, record, bookIndex, c ->
-            c.map(id).toPropertyWhenPresent("id", record::getId)
-            .map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
-            .map(indexNum).toPropertyWhenPresent("indexNum", record::getIndexNum)
-            .map(indexName).toPropertyWhenPresent("indexName", record::getIndexName)
-            .map(wordCount).toPropertyWhenPresent("wordCount", record::getWordCount)
-            .map(isVip).toPropertyWhenPresent("isVip", record::getIsVip)
-            .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
-            .map(updateTime).toPropertyWhenPresent("updateTime", record::getUpdateTime)
+                c.map(id).toPropertyWhenPresent("id", record::getId)
+                        .map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
+                        .map(indexNum).toPropertyWhenPresent("indexNum", record::getIndexNum)
+                        .map(indexName).toPropertyWhenPresent("indexName", record::getIndexName)
+                        .map(wordCount).toPropertyWhenPresent("wordCount", record::getWordCount)
+                        .map(isVip).toPropertyWhenPresent("isVip", record::getIsVip)
+                        .map(bookPrice).toPropertyWhenPresent("bookPrice", record::getBookPrice)
+                        .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
+                        .map(updateTime).toPropertyWhenPresent("updateTime", record::getUpdateTime)
         );
     }
 
@@ -153,7 +159,7 @@ public interface BookIndexMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default Optional<BookIndex> selectByPrimaryKey(Long id_) {
         return selectOne(c ->
-            c.where(id, isEqualTo(id_))
+                c.where(id, isEqualTo(id_))
         );
     }
 
@@ -170,6 +176,7 @@ public interface BookIndexMapper {
                 .set(indexName).equalTo(record::getIndexName)
                 .set(wordCount).equalTo(record::getWordCount)
                 .set(isVip).equalTo(record::getIsVip)
+                .set(bookPrice).equalTo(record::getBookPrice)
                 .set(createTime).equalTo(record::getCreateTime)
                 .set(updateTime).equalTo(record::getUpdateTime);
     }
@@ -182,6 +189,7 @@ public interface BookIndexMapper {
                 .set(indexName).equalToWhenPresent(record::getIndexName)
                 .set(wordCount).equalToWhenPresent(record::getWordCount)
                 .set(isVip).equalToWhenPresent(record::getIsVip)
+                .set(bookPrice).equalToWhenPresent(record::getBookPrice)
                 .set(createTime).equalToWhenPresent(record::getCreateTime)
                 .set(updateTime).equalToWhenPresent(record::getUpdateTime);
     }
@@ -189,28 +197,30 @@ public interface BookIndexMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int updateByPrimaryKey(BookIndex record) {
         return update(c ->
-            c.set(bookId).equalTo(record::getBookId)
-            .set(indexNum).equalTo(record::getIndexNum)
-            .set(indexName).equalTo(record::getIndexName)
-            .set(wordCount).equalTo(record::getWordCount)
-            .set(isVip).equalTo(record::getIsVip)
-            .set(createTime).equalTo(record::getCreateTime)
-            .set(updateTime).equalTo(record::getUpdateTime)
-            .where(id, isEqualTo(record::getId))
+                c.set(bookId).equalTo(record::getBookId)
+                        .set(indexNum).equalTo(record::getIndexNum)
+                        .set(indexName).equalTo(record::getIndexName)
+                        .set(wordCount).equalTo(record::getWordCount)
+                        .set(isVip).equalTo(record::getIsVip)
+                        .set(bookPrice).equalTo(record::getBookPrice)
+                        .set(createTime).equalTo(record::getCreateTime)
+                        .set(updateTime).equalTo(record::getUpdateTime)
+                        .where(id, isEqualTo(record::getId))
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int updateByPrimaryKeySelective(BookIndex record) {
         return update(c ->
-            c.set(bookId).equalToWhenPresent(record::getBookId)
-            .set(indexNum).equalToWhenPresent(record::getIndexNum)
-            .set(indexName).equalToWhenPresent(record::getIndexName)
-            .set(wordCount).equalToWhenPresent(record::getWordCount)
-            .set(isVip).equalToWhenPresent(record::getIsVip)
-            .set(createTime).equalToWhenPresent(record::getCreateTime)
-            .set(updateTime).equalToWhenPresent(record::getUpdateTime)
-            .where(id, isEqualTo(record::getId))
+                c.set(bookId).equalToWhenPresent(record::getBookId)
+                        .set(indexNum).equalToWhenPresent(record::getIndexNum)
+                        .set(indexName).equalToWhenPresent(record::getIndexName)
+                        .set(wordCount).equalToWhenPresent(record::getWordCount)
+                        .set(isVip).equalToWhenPresent(record::getIsVip)
+                        .set(bookPrice).equalToWhenPresent(record::getBookPrice)
+                        .set(createTime).equalToWhenPresent(record::getCreateTime)
+                        .set(updateTime).equalToWhenPresent(record::getUpdateTime)
+                        .where(id, isEqualTo(record::getId))
         );
     }
 }

novel-common/src/main/java/com/java2nb/novel/mapper/BookMapper.java

@@ -4,10 +4,12 @@ import static com.java2nb.novel.mapper.BookDynamicSqlSupport.*;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
 
 import com.java2nb.novel.entity.Book;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Generated;
+
 import org.apache.ibatis.annotations.DeleteProvider;
 import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Mapper;
@@ -35,62 +37,63 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 @Mapper
 public interface BookMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, workDirection, catId, catName, picUrl, bookName, authorId, authorName, bookDesc, score, bookStatus, visitCount, wordCount, commentCount, lastIndexId, lastIndexName, lastIndexUpdateTime, isVip, status, updateTime, createTime, crawlSourceId, crawlBookId, crawlLastTime, crawlIsStop);
+    BasicColumn[] selectList = BasicColumn.columnList(id, workDirection, catId, catName, picUrl, bookName, authorId, authorName, bookDesc, score, bookStatus, visitCount, wordCount, commentCount, yesterdayBuy, lastIndexId, lastIndexName, lastIndexUpdateTime, isVip, status, updateTime, createTime, crawlSourceId, crawlBookId, crawlLastTime, crawlIsStop);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
     long count(SelectStatementProvider selectStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
+    @DeleteProvider(type = SqlProviderAdapter.class, method = "delete")
     int delete(DeleteStatementProvider deleteStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
+    @InsertProvider(type = SqlProviderAdapter.class, method = "insert")
     int insert(InsertStatementProvider<Book> insertStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @InsertProvider(type=SqlProviderAdapter.class, method="insertMultiple")
+    @InsertProvider(type = SqlProviderAdapter.class, method = "insertMultiple")
     int insertMultiple(MultiRowInsertStatementProvider<Book> multipleInsertStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
     @ResultMap("BookResult")
     Optional<Book> selectOne(SelectStatementProvider selectStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results(id="BookResult", value = {
-        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
-        @Result(column="work_direction", property="workDirection", jdbcType=JdbcType.TINYINT),
-        @Result(column="cat_id", property="catId", jdbcType=JdbcType.INTEGER),
-        @Result(column="cat_name", property="catName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="pic_url", property="picUrl", jdbcType=JdbcType.VARCHAR),
-        @Result(column="book_name", property="bookName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="author_id", property="authorId", jdbcType=JdbcType.BIGINT),
-        @Result(column="author_name", property="authorName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="book_desc", property="bookDesc", jdbcType=JdbcType.VARCHAR),
-        @Result(column="score", property="score", jdbcType=JdbcType.REAL),
-        @Result(column="book_status", property="bookStatus", jdbcType=JdbcType.TINYINT),
-        @Result(column="visit_count", property="visitCount", jdbcType=JdbcType.BIGINT),
-        @Result(column="word_count", property="wordCount", jdbcType=JdbcType.INTEGER),
-        @Result(column="comment_count", property="commentCount", jdbcType=JdbcType.INTEGER),
-        @Result(column="last_index_id", property="lastIndexId", jdbcType=JdbcType.BIGINT),
-        @Result(column="last_index_name", property="lastIndexName", jdbcType=JdbcType.VARCHAR),
-        @Result(column="last_index_update_time", property="lastIndexUpdateTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="is_vip", property="isVip", jdbcType=JdbcType.TINYINT),
-        @Result(column="status", property="status", jdbcType=JdbcType.TINYINT),
-        @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="crawl_source_id", property="crawlSourceId", jdbcType=JdbcType.INTEGER),
-        @Result(column="crawl_book_id", property="crawlBookId", jdbcType=JdbcType.VARCHAR),
-        @Result(column="crawl_last_time", property="crawlLastTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="crawl_is_stop", property="crawlIsStop", jdbcType=JdbcType.TINYINT)
+    @SelectProvider(type = SqlProviderAdapter.class, method = "select")
+    @Results(id = "BookResult", value = {
+            @Result(column = "id", property = "id", jdbcType = JdbcType.BIGINT, id = true),
+            @Result(column = "work_direction", property = "workDirection", jdbcType = JdbcType.TINYINT),
+            @Result(column = "cat_id", property = "catId", jdbcType = JdbcType.INTEGER),
+            @Result(column = "cat_name", property = "catName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "pic_url", property = "picUrl", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "book_name", property = "bookName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "author_id", property = "authorId", jdbcType = JdbcType.BIGINT),
+            @Result(column = "author_name", property = "authorName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "book_desc", property = "bookDesc", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "score", property = "score", jdbcType = JdbcType.REAL),
+            @Result(column = "book_status", property = "bookStatus", jdbcType = JdbcType.TINYINT),
+            @Result(column = "visit_count", property = "visitCount", jdbcType = JdbcType.BIGINT),
+            @Result(column = "word_count", property = "wordCount", jdbcType = JdbcType.INTEGER),
+            @Result(column = "comment_count", property = "commentCount", jdbcType = JdbcType.INTEGER),
+            @Result(column="yesterday_buy", property="yesterdayBuy", jdbcType=JdbcType.INTEGER),
+            @Result(column = "last_index_id", property = "lastIndexId", jdbcType = JdbcType.BIGINT),
+            @Result(column = "last_index_name", property = "lastIndexName", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "last_index_update_time", property = "lastIndexUpdateTime", jdbcType = JdbcType.TIMESTAMP),
+            @Result(column = "is_vip", property = "isVip", jdbcType = JdbcType.TINYINT),
+            @Result(column = "status", property = "status", jdbcType = JdbcType.TINYINT),
+            @Result(column = "update_time", property = "updateTime", jdbcType = JdbcType.TIMESTAMP),
+            @Result(column = "create_time", property = "createTime", jdbcType = JdbcType.TIMESTAMP),
+            @Result(column = "crawl_source_id", property = "crawlSourceId", jdbcType = JdbcType.INTEGER),
+            @Result(column = "crawl_book_id", property = "crawlBookId", jdbcType = JdbcType.VARCHAR),
+            @Result(column = "crawl_last_time", property = "crawlLastTime", jdbcType = JdbcType.TIMESTAMP),
+            @Result(column = "crawl_is_stop", property = "crawlIsStop", jdbcType = JdbcType.TINYINT)
     })
     List<Book> selectMany(SelectStatementProvider selectStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
+    @UpdateProvider(type = SqlProviderAdapter.class, method = "update")
     int update(UpdateStatementProvider updateStatement);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
@@ -105,101 +108,104 @@ public interface BookMapper {
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int deleteByPrimaryKey(Long id_) {
-        return delete(c -> 
-            c.where(id, isEqualTo(id_))
+        return delete(c ->
+                c.where(id, isEqualTo(id_))
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int insert(Book record) {
         return MyBatis3Utils.insert(this::insert, record, book, c ->
-            c.map(id).toProperty("id")
-            .map(workDirection).toProperty("workDirection")
-            .map(catId).toProperty("catId")
-            .map(catName).toProperty("catName")
-            .map(picUrl).toProperty("picUrl")
-            .map(bookName).toProperty("bookName")
-            .map(authorId).toProperty("authorId")
-            .map(authorName).toProperty("authorName")
-            .map(bookDesc).toProperty("bookDesc")
-            .map(score).toProperty("score")
-            .map(bookStatus).toProperty("bookStatus")
-            .map(visitCount).toProperty("visitCount")
-            .map(wordCount).toProperty("wordCount")
-            .map(commentCount).toProperty("commentCount")
-            .map(lastIndexId).toProperty("lastIndexId")
-            .map(lastIndexName).toProperty("lastIndexName")
-            .map(lastIndexUpdateTime).toProperty("lastIndexUpdateTime")
-            .map(isVip).toProperty("isVip")
-            .map(status).toProperty("status")
-            .map(updateTime).toProperty("updateTime")
-            .map(createTime).toProperty("createTime")
-            .map(crawlSourceId).toProperty("crawlSourceId")
-            .map(crawlBookId).toProperty("crawlBookId")
-            .map(crawlLastTime).toProperty("crawlLastTime")
-            .map(crawlIsStop).toProperty("crawlIsStop")
+                c.map(id).toProperty("id")
+                        .map(workDirection).toProperty("workDirection")
+                        .map(catId).toProperty("catId")
+                        .map(catName).toProperty("catName")
+                        .map(picUrl).toProperty("picUrl")
+                        .map(bookName).toProperty("bookName")
+                        .map(authorId).toProperty("authorId")
+                        .map(authorName).toProperty("authorName")
+                        .map(bookDesc).toProperty("bookDesc")
+                        .map(score).toProperty("score")
+                        .map(bookStatus).toProperty("bookStatus")
+                        .map(visitCount).toProperty("visitCount")
+                        .map(wordCount).toProperty("wordCount")
+                        .map(commentCount).toProperty("commentCount")
+                        .map(yesterdayBuy).toProperty("yesterdayBuy")
+                        .map(lastIndexId).toProperty("lastIndexId")
+                        .map(lastIndexName).toProperty("lastIndexName")
+                        .map(lastIndexUpdateTime).toProperty("lastIndexUpdateTime")
+                        .map(isVip).toProperty("isVip")
+                        .map(status).toProperty("status")
+                        .map(updateTime).toProperty("updateTime")
+                        .map(createTime).toProperty("createTime")
+                        .map(crawlSourceId).toProperty("crawlSourceId")
+                        .map(crawlBookId).toProperty("crawlBookId")
+                        .map(crawlLastTime).toProperty("crawlLastTime")
+                        .map(crawlIsStop).toProperty("crawlIsStop")
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int insertMultiple(Collection<Book> records) {
         return MyBatis3Utils.insertMultiple(this::insertMultiple, records, book, c ->
-            c.map(id).toProperty("id")
-            .map(workDirection).toProperty("workDirection")
-            .map(catId).toProperty("catId")
-            .map(catName).toProperty("catName")
-            .map(picUrl).toProperty("picUrl")
-            .map(bookName).toProperty("bookName")
-            .map(authorId).toProperty("authorId")
-            .map(authorName).toProperty("authorName")
-            .map(bookDesc).toProperty("bookDesc")
-            .map(score).toProperty("score")
-            .map(bookStatus).toProperty("bookStatus")
-            .map(visitCount).toProperty("visitCount")
-            .map(wordCount).toProperty("wordCount")
-            .map(commentCount).toProperty("commentCount")
-            .map(lastIndexId).toProperty("lastIndexId")
-            .map(lastIndexName).toProperty("lastIndexName")
-            .map(lastIndexUpdateTime).toProperty("lastIndexUpdateTime")
-            .map(isVip).toProperty("isVip")
-            .map(status).toProperty("status")
-            .map(updateTime).toProperty("updateTime")
-            .map(createTime).toProperty("createTime")
-            .map(crawlSourceId).toProperty("crawlSourceId")
-            .map(crawlBookId).toProperty("crawlBookId")
-            .map(crawlLastTime).toProperty("crawlLastTime")
-            .map(crawlIsStop).toProperty("crawlIsStop")
+                c.map(id).toProperty("id")
+                        .map(workDirection).toProperty("workDirection")
+                        .map(catId).toProperty("catId")
+                        .map(catName).toProperty("catName")
+                        .map(picUrl).toProperty("picUrl")
+                        .map(bookName).toProperty("bookName")
+                        .map(authorId).toProperty("authorId")
+                        .map(authorName).toProperty("authorName")
+                        .map(bookDesc).toProperty("bookDesc")
+                        .map(score).toProperty("score")
+                        .map(bookStatus).toProperty("bookStatus")
+                        .map(visitCount).toProperty("visitCount")
+                        .map(wordCount).toProperty("wordCount")
+                        .map(commentCount).toProperty("commentCount")
+                        .map(yesterdayBuy).toProperty("yesterdayBuy")
+                        .map(lastIndexId).toProperty("lastIndexId")
+                        .map(lastIndexName).toProperty("lastIndexName")
+                        .map(lastIndexUpdateTime).toProperty("lastIndexUpdateTime")
+                        .map(isVip).toProperty("isVip")
+                        .map(status).toProperty("status")
+                        .map(updateTime).toProperty("updateTime")
+                        .map(createTime).toProperty("createTime")
+                        .map(crawlSourceId).toProperty("crawlSourceId")
+                        .map(crawlBookId).toProperty("crawlBookId")
+                        .map(crawlLastTime).toProperty("crawlLastTime")
+                        .map(crawlIsStop).toProperty("crawlIsStop")
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int insertSelective(Book record) {
         return MyBatis3Utils.insert(this::insert, record, book, c ->
-            c.map(id).toPropertyWhenPresent("id", record::getId)
-            .map(workDirection).toPropertyWhenPresent("workDirection", record::getWorkDirection)
-            .map(catId).toPropertyWhenPresent("catId", record::getCatId)
-            .map(catName).toPropertyWhenPresent("catName", record::getCatName)
-            .map(picUrl).toPropertyWhenPresent("picUrl", record::getPicUrl)
-            .map(bookName).toPropertyWhenPresent("bookName", record::getBookName)
-            .map(authorId).toPropertyWhenPresent("authorId", record::getAuthorId)
-            .map(authorName).toPropertyWhenPresent("authorName", record::getAuthorName)
-            .map(bookDesc).toPropertyWhenPresent("bookDesc", record::getBookDesc)
-            .map(score).toPropertyWhenPresent("score", record::getScore)
-            .map(bookStatus).toPropertyWhenPresent("bookStatus", record::getBookStatus)
-            .map(visitCount).toPropertyWhenPresent("visitCount", record::getVisitCount)
-            .map(wordCount).toPropertyWhenPresent("wordCount", record::getWordCount)
-            .map(commentCount).toPropertyWhenPresent("commentCount", record::getCommentCount)
-            .map(lastIndexId).toPropertyWhenPresent("lastIndexId", record::getLastIndexId)
-            .map(lastIndexName).toPropertyWhenPresent("lastIndexName", record::getLastIndexName)
-            .map(lastIndexUpdateTime).toPropertyWhenPresent("lastIndexUpdateTime", record::getLastIndexUpdateTime)
-            .map(isVip).toPropertyWhenPresent("isVip", record::getIsVip)
-            .map(status).toPropertyWhenPresent("status", record::getStatus)
-            .map(updateTime).toPropertyWhenPresent("updateTime", record::getUpdateTime)
-            .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
-            .map(crawlSourceId).toPropertyWhenPresent("crawlSourceId", record::getCrawlSourceId)
-            .map(crawlBookId).toPropertyWhenPresent("crawlBookId", record::getCrawlBookId)
-            .map(crawlLastTime).toPropertyWhenPresent("crawlLastTime", record::getCrawlLastTime)
-            .map(crawlIsStop).toPropertyWhenPresent("crawlIsStop", record::getCrawlIsStop)
+                c.map(id).toPropertyWhenPresent("id", record::getId)
+                        .map(workDirection).toPropertyWhenPresent("workDirection", record::getWorkDirection)
+                        .map(catId).toPropertyWhenPresent("catId", record::getCatId)
+                        .map(catName).toPropertyWhenPresent("catName", record::getCatName)
+                        .map(picUrl).toPropertyWhenPresent("picUrl", record::getPicUrl)
+                        .map(bookName).toPropertyWhenPresent("bookName", record::getBookName)
+                        .map(authorId).toPropertyWhenPresent("authorId", record::getAuthorId)
+                        .map(authorName).toPropertyWhenPresent("authorName", record::getAuthorName)
+                        .map(bookDesc).toPropertyWhenPresent("bookDesc", record::getBookDesc)
+                        .map(score).toPropertyWhenPresent("score", record::getScore)
+                        .map(bookStatus).toPropertyWhenPresent("bookStatus", record::getBookStatus)
+                        .map(visitCount).toPropertyWhenPresent("visitCount", record::getVisitCount)
+                        .map(wordCount).toPropertyWhenPresent("wordCount", record::getWordCount)
+                        .map(commentCount).toPropertyWhenPresent("commentCount", record::getCommentCount)
+                        .map(yesterdayBuy).toPropertyWhenPresent("yesterdayBuy", record::getYesterdayBuy)
+                        .map(lastIndexId).toPropertyWhenPresent("lastIndexId", record::getLastIndexId)
+                        .map(lastIndexName).toPropertyWhenPresent("lastIndexName", record::getLastIndexName)
+                        .map(lastIndexUpdateTime).toPropertyWhenPresent("lastIndexUpdateTime", record::getLastIndexUpdateTime)
+                        .map(isVip).toPropertyWhenPresent("isVip", record::getIsVip)
+                        .map(status).toPropertyWhenPresent("status", record::getStatus)
+                        .map(updateTime).toPropertyWhenPresent("updateTime", record::getUpdateTime)
+                        .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
+                        .map(crawlSourceId).toPropertyWhenPresent("crawlSourceId", record::getCrawlSourceId)
+                        .map(crawlBookId).toPropertyWhenPresent("crawlBookId", record::getCrawlBookId)
+                        .map(crawlLastTime).toPropertyWhenPresent("crawlLastTime", record::getCrawlLastTime)
+                        .map(crawlIsStop).toPropertyWhenPresent("crawlIsStop", record::getCrawlIsStop)
         );
     }
 
@@ -221,7 +227,7 @@ public interface BookMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default Optional<Book> selectByPrimaryKey(Long id_) {
         return selectOne(c ->
-            c.where(id, isEqualTo(id_))
+                c.where(id, isEqualTo(id_))
         );
     }
 
@@ -246,6 +252,7 @@ public interface BookMapper {
                 .set(visitCount).equalTo(record::getVisitCount)
                 .set(wordCount).equalTo(record::getWordCount)
                 .set(commentCount).equalTo(record::getCommentCount)
+                .set(yesterdayBuy).equalTo(record::getYesterdayBuy)
                 .set(lastIndexId).equalTo(record::getLastIndexId)
                 .set(lastIndexName).equalTo(record::getLastIndexName)
                 .set(lastIndexUpdateTime).equalTo(record::getLastIndexUpdateTime)
@@ -275,6 +282,7 @@ public interface BookMapper {
                 .set(visitCount).equalToWhenPresent(record::getVisitCount)
                 .set(wordCount).equalToWhenPresent(record::getWordCount)
                 .set(commentCount).equalToWhenPresent(record::getCommentCount)
+                .set(yesterdayBuy).equalToWhenPresent(record::getYesterdayBuy)
                 .set(lastIndexId).equalToWhenPresent(record::getLastIndexId)
                 .set(lastIndexName).equalToWhenPresent(record::getLastIndexName)
                 .set(lastIndexUpdateTime).equalToWhenPresent(record::getLastIndexUpdateTime)
@@ -291,62 +299,64 @@ public interface BookMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int updateByPrimaryKey(Book record) {
         return update(c ->
-            c.set(workDirection).equalTo(record::getWorkDirection)
-            .set(catId).equalTo(record::getCatId)
-            .set(catName).equalTo(record::getCatName)
-            .set(picUrl).equalTo(record::getPicUrl)
-            .set(bookName).equalTo(record::getBookName)
-            .set(authorId).equalTo(record::getAuthorId)
-            .set(authorName).equalTo(record::getAuthorName)
-            .set(bookDesc).equalTo(record::getBookDesc)
-            .set(score).equalTo(record::getScore)
-            .set(bookStatus).equalTo(record::getBookStatus)
-            .set(visitCount).equalTo(record::getVisitCount)
-            .set(wordCount).equalTo(record::getWordCount)
-            .set(commentCount).equalTo(record::getCommentCount)
-            .set(lastIndexId).equalTo(record::getLastIndexId)
-            .set(lastIndexName).equalTo(record::getLastIndexName)
-            .set(lastIndexUpdateTime).equalTo(record::getLastIndexUpdateTime)
-            .set(isVip).equalTo(record::getIsVip)
-            .set(status).equalTo(record::getStatus)
-            .set(updateTime).equalTo(record::getUpdateTime)
-            .set(createTime).equalTo(record::getCreateTime)
-            .set(crawlSourceId).equalTo(record::getCrawlSourceId)
-            .set(crawlBookId).equalTo(record::getCrawlBookId)
-            .set(crawlLastTime).equalTo(record::getCrawlLastTime)
-            .set(crawlIsStop).equalTo(record::getCrawlIsStop)
-            .where(id, isEqualTo(record::getId))
+                c.set(workDirection).equalTo(record::getWorkDirection)
+                        .set(catId).equalTo(record::getCatId)
+                        .set(catName).equalTo(record::getCatName)
+                        .set(picUrl).equalTo(record::getPicUrl)
+                        .set(bookName).equalTo(record::getBookName)
+                        .set(authorId).equalTo(record::getAuthorId)
+                        .set(authorName).equalTo(record::getAuthorName)
+                        .set(bookDesc).equalTo(record::getBookDesc)
+                        .set(score).equalTo(record::getScore)
+                        .set(bookStatus).equalTo(record::getBookStatus)
+                        .set(visitCount).equalTo(record::getVisitCount)
+                        .set(wordCount).equalTo(record::getWordCount)
+                        .set(commentCount).equalTo(record::getCommentCount)
+                        .set(yesterdayBuy).equalTo(record::getYesterdayBuy)
+                        .set(lastIndexId).equalTo(record::getLastIndexId)
+                        .set(lastIndexName).equalTo(record::getLastIndexName)
+                        .set(lastIndexUpdateTime).equalTo(record::getLastIndexUpdateTime)
+                        .set(isVip).equalTo(record::getIsVip)
+                        .set(status).equalTo(record::getStatus)
+                        .set(updateTime).equalTo(record::getUpdateTime)
+                        .set(createTime).equalTo(record::getCreateTime)
+                        .set(crawlSourceId).equalTo(record::getCrawlSourceId)
+                        .set(crawlBookId).equalTo(record::getCrawlBookId)
+                        .set(crawlLastTime).equalTo(record::getCrawlLastTime)
+                        .set(crawlIsStop).equalTo(record::getCrawlIsStop)
+                        .where(id, isEqualTo(record::getId))
         );
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int updateByPrimaryKeySelective(Book record) {
         return update(c ->
-            c.set(workDirection).equalToWhenPresent(record::getWorkDirection)
-            .set(catId).equalToWhenPresent(record::getCatId)
-            .set(catName).equalToWhenPresent(record::getCatName)
-            .set(picUrl).equalToWhenPresent(record::getPicUrl)
-            .set(bookName).equalToWhenPresent(record::getBookName)
-            .set(authorId).equalToWhenPresent(record::getAuthorId)
-            .set(authorName).equalToWhenPresent(record::getAuthorName)
-            .set(bookDesc).equalToWhenPresent(record::getBookDesc)
-            .set(score).equalToWhenPresent(record::getScore)
-            .set(bookStatus).equalToWhenPresent(record::getBookStatus)
-            .set(visitCount).equalToWhenPresent(record::getVisitCount)
-            .set(wordCount).equalToWhenPresent(record::getWordCount)
-            .set(commentCount).equalToWhenPresent(record::getCommentCount)
-            .set(lastIndexId).equalToWhenPresent(record::getLastIndexId)
-            .set(lastIndexName).equalToWhenPresent(record::getLastIndexName)
-            .set(lastIndexUpdateTime).equalToWhenPresent(record::getLastIndexUpdateTime)
-            .set(isVip).equalToWhenPresent(record::getIsVip)
-            .set(status).equalToWhenPresent(record::getStatus)
-            .set(updateTime).equalToWhenPresent(record::getUpdateTime)
-            .set(createTime).equalToWhenPresent(record::getCreateTime)
-            .set(crawlSourceId).equalToWhenPresent(record::getCrawlSourceId)
-            .set(crawlBookId).equalToWhenPresent(record::getCrawlBookId)
-            .set(crawlLastTime).equalToWhenPresent(record::getCrawlLastTime)
-            .set(crawlIsStop).equalToWhenPresent(record::getCrawlIsStop)
-            .where(id, isEqualTo(record::getId))
+                c.set(workDirection).equalToWhenPresent(record::getWorkDirection)
+                        .set(catId).equalToWhenPresent(record::getCatId)
+                        .set(catName).equalToWhenPresent(record::getCatName)
+                        .set(picUrl).equalToWhenPresent(record::getPicUrl)
+                        .set(bookName).equalToWhenPresent(record::getBookName)
+                        .set(authorId).equalToWhenPresent(record::getAuthorId)
+                        .set(authorName).equalToWhenPresent(record::getAuthorName)
+                        .set(bookDesc).equalToWhenPresent(record::getBookDesc)
+                        .set(score).equalToWhenPresent(record::getScore)
+                        .set(bookStatus).equalToWhenPresent(record::getBookStatus)
+                        .set(visitCount).equalToWhenPresent(record::getVisitCount)
+                        .set(wordCount).equalToWhenPresent(record::getWordCount)
+                        .set(commentCount).equalToWhenPresent(record::getCommentCount)
+                        .set(yesterdayBuy).equalToWhenPresent(record::getYesterdayBuy)
+                        .set(lastIndexId).equalToWhenPresent(record::getLastIndexId)
+                        .set(lastIndexName).equalToWhenPresent(record::getLastIndexName)
+                        .set(lastIndexUpdateTime).equalToWhenPresent(record::getLastIndexUpdateTime)
+                        .set(isVip).equalToWhenPresent(record::getIsVip)
+                        .set(status).equalToWhenPresent(record::getStatus)
+                        .set(updateTime).equalToWhenPresent(record::getUpdateTime)
+                        .set(createTime).equalToWhenPresent(record::getCreateTime)
+                        .set(crawlSourceId).equalToWhenPresent(record::getCrawlSourceId)
+                        .set(crawlBookId).equalToWhenPresent(record::getCrawlBookId)
+                        .set(crawlLastTime).equalToWhenPresent(record::getCrawlLastTime)
+                        .set(crawlIsStop).equalToWhenPresent(record::getCrawlIsStop)
+                        .where(id, isEqualTo(record::getId))
         );
     }
 }

novel-common/src/main/java/com/java2nb/novel/mapper/CrawlSingleTaskDynamicSqlSupport.java

@@ -16,9 +16,21 @@ public final class CrawlSingleTaskDynamicSqlSupport {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Integer> sourceId = crawlSingleTask.sourceId;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<String> sourceName = crawlSingleTask.sourceName;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<String> sourceBookId = crawlSingleTask.sourceBookId;
 
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<Integer> catId = crawlSingleTask.catId;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<String> bookName = crawlSingleTask.bookName;
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    public static final SqlColumn<String> authorName = crawlSingleTask.authorName;
+
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Byte> taskStatus = crawlSingleTask.taskStatus;
 
@@ -34,8 +46,16 @@ public final class CrawlSingleTaskDynamicSqlSupport {
 
         public final SqlColumn<Integer> sourceId = column("source_id", JDBCType.INTEGER);
 
+        public final SqlColumn<String> sourceName = column("source_name", JDBCType.VARCHAR);
+
         public final SqlColumn<String> sourceBookId = column("source_book_id", JDBCType.VARCHAR);
 
+        public final SqlColumn<Integer> catId = column("cat_id", JDBCType.INTEGER);
+
+        public final SqlColumn<String> bookName = column("book_name", JDBCType.VARCHAR);
+
+        public final SqlColumn<String> authorName = column("author_name", JDBCType.VARCHAR);
+
         public final SqlColumn<Byte> taskStatus = column("task_status", JDBCType.TINYINT);
 
         public final SqlColumn<Byte> excCount = column("exc_count", JDBCType.TINYINT);

novel-common/src/main/java/com/java2nb/novel/mapper/CrawlSingleTaskMapper.java

@@ -35,7 +35,7 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 @Mapper
 public interface CrawlSingleTaskMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, sourceId, sourceBookId, taskStatus, excCount, createTime);
+    BasicColumn[] selectList = BasicColumn.columnList(id, sourceId, sourceName, sourceBookId, catId, bookName, authorName, taskStatus, excCount, createTime);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
@@ -63,7 +63,11 @@ public interface CrawlSingleTaskMapper {
     @Results(id="CrawlSingleTaskResult", value = {
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="source_id", property="sourceId", jdbcType=JdbcType.INTEGER),
+        @Result(column="source_name", property="sourceName", jdbcType=JdbcType.VARCHAR),
         @Result(column="source_book_id", property="sourceBookId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="cat_id", property="catId", jdbcType=JdbcType.INTEGER),
+        @Result(column="book_name", property="bookName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="author_name", property="authorName", jdbcType=JdbcType.VARCHAR),
         @Result(column="task_status", property="taskStatus", jdbcType=JdbcType.TINYINT),
         @Result(column="exc_count", property="excCount", jdbcType=JdbcType.TINYINT),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP)
@@ -96,7 +100,11 @@ public interface CrawlSingleTaskMapper {
         return MyBatis3Utils.insert(this::insert, record, crawlSingleTask, c ->
             c.map(id).toProperty("id")
             .map(sourceId).toProperty("sourceId")
+            .map(sourceName).toProperty("sourceName")
             .map(sourceBookId).toProperty("sourceBookId")
+            .map(catId).toProperty("catId")
+            .map(bookName).toProperty("bookName")
+            .map(authorName).toProperty("authorName")
             .map(taskStatus).toProperty("taskStatus")
             .map(excCount).toProperty("excCount")
             .map(createTime).toProperty("createTime")
@@ -108,7 +116,11 @@ public interface CrawlSingleTaskMapper {
         return MyBatis3Utils.insertMultiple(this::insertMultiple, records, crawlSingleTask, c ->
             c.map(id).toProperty("id")
             .map(sourceId).toProperty("sourceId")
+            .map(sourceName).toProperty("sourceName")
             .map(sourceBookId).toProperty("sourceBookId")
+            .map(catId).toProperty("catId")
+            .map(bookName).toProperty("bookName")
+            .map(authorName).toProperty("authorName")
             .map(taskStatus).toProperty("taskStatus")
             .map(excCount).toProperty("excCount")
             .map(createTime).toProperty("createTime")
@@ -120,7 +132,11 @@ public interface CrawlSingleTaskMapper {
         return MyBatis3Utils.insert(this::insert, record, crawlSingleTask, c ->
             c.map(id).toPropertyWhenPresent("id", record::getId)
             .map(sourceId).toPropertyWhenPresent("sourceId", record::getSourceId)
+            .map(sourceName).toPropertyWhenPresent("sourceName", record::getSourceName)
             .map(sourceBookId).toPropertyWhenPresent("sourceBookId", record::getSourceBookId)
+            .map(catId).toPropertyWhenPresent("catId", record::getCatId)
+            .map(bookName).toPropertyWhenPresent("bookName", record::getBookName)
+            .map(authorName).toPropertyWhenPresent("authorName", record::getAuthorName)
             .map(taskStatus).toPropertyWhenPresent("taskStatus", record::getTaskStatus)
             .map(excCount).toPropertyWhenPresent("excCount", record::getExcCount)
             .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
@@ -158,7 +174,11 @@ public interface CrawlSingleTaskMapper {
     static UpdateDSL<UpdateModel> updateAllColumns(CrawlSingleTask record, UpdateDSL<UpdateModel> dsl) {
         return dsl.set(id).equalTo(record::getId)
                 .set(sourceId).equalTo(record::getSourceId)
+                .set(sourceName).equalTo(record::getSourceName)
                 .set(sourceBookId).equalTo(record::getSourceBookId)
+                .set(catId).equalTo(record::getCatId)
+                .set(bookName).equalTo(record::getBookName)
+                .set(authorName).equalTo(record::getAuthorName)
                 .set(taskStatus).equalTo(record::getTaskStatus)
                 .set(excCount).equalTo(record::getExcCount)
                 .set(createTime).equalTo(record::getCreateTime);
@@ -168,7 +188,11 @@ public interface CrawlSingleTaskMapper {
     static UpdateDSL<UpdateModel> updateSelectiveColumns(CrawlSingleTask record, UpdateDSL<UpdateModel> dsl) {
         return dsl.set(id).equalToWhenPresent(record::getId)
                 .set(sourceId).equalToWhenPresent(record::getSourceId)
+                .set(sourceName).equalToWhenPresent(record::getSourceName)
                 .set(sourceBookId).equalToWhenPresent(record::getSourceBookId)
+                .set(catId).equalToWhenPresent(record::getCatId)
+                .set(bookName).equalToWhenPresent(record::getBookName)
+                .set(authorName).equalToWhenPresent(record::getAuthorName)
                 .set(taskStatus).equalToWhenPresent(record::getTaskStatus)
                 .set(excCount).equalToWhenPresent(record::getExcCount)
                 .set(createTime).equalToWhenPresent(record::getCreateTime);
@@ -178,7 +202,11 @@ public interface CrawlSingleTaskMapper {
     default int updateByPrimaryKey(CrawlSingleTask record) {
         return update(c ->
             c.set(sourceId).equalTo(record::getSourceId)
+            .set(sourceName).equalTo(record::getSourceName)
             .set(sourceBookId).equalTo(record::getSourceBookId)
+            .set(catId).equalTo(record::getCatId)
+            .set(bookName).equalTo(record::getBookName)
+            .set(authorName).equalTo(record::getAuthorName)
             .set(taskStatus).equalTo(record::getTaskStatus)
             .set(excCount).equalTo(record::getExcCount)
             .set(createTime).equalTo(record::getCreateTime)
@@ -190,7 +218,11 @@ public interface CrawlSingleTaskMapper {
     default int updateByPrimaryKeySelective(CrawlSingleTask record) {
         return update(c ->
             c.set(sourceId).equalToWhenPresent(record::getSourceId)
+            .set(sourceName).equalToWhenPresent(record::getSourceName)
             .set(sourceBookId).equalToWhenPresent(record::getSourceBookId)
+            .set(catId).equalToWhenPresent(record::getCatId)
+            .set(bookName).equalToWhenPresent(record::getBookName)
+            .set(authorName).equalToWhenPresent(record::getAuthorName)
             .set(taskStatus).equalToWhenPresent(record::getTaskStatus)
             .set(excCount).equalToWhenPresent(record::getExcCount)
             .set(createTime).equalToWhenPresent(record::getCreateTime)

novel-common/src/main/java/com/java2nb/novel/mapper/UserMapper.java

@@ -8,14 +8,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Generated;
-import org.apache.ibatis.annotations.DeleteProvider;
-import org.apache.ibatis.annotations.InsertProvider;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.UpdateProvider;
+
+import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
 import org.mybatis.dynamic.sql.BasicColumn;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
@@ -229,4 +223,8 @@ public interface UserMapper {
             .where(id, isEqualTo(record::getId))
         );
     }
+
+    @SelectProvider(type=SqlProviderAdapter.class, method="select")
+    @ResultType(value = Integer.class)
+    Integer selectStatistic(SelectStatementProvider selectStatement);
 }

novel-common/src/main/resources/application-common-dev.yml

@@ -1,19 +1,77 @@
 spring:
   profiles:
     include: [common]
+  main:
+    allow-bean-definition-overriding: true
+  #Redis服务器IP
+  redis:
+    host: 127.0.0.1
+    #Redis服务器连接端口
+    port: 6379
+    #Redis服务器连接密码
+    password: test
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 8
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 1
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8
+        #连接池中的最小空闲连接
+        min-idle: 0
+    #连接超时时间（毫秒）
+    timeout: 30000
   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
 
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+
+sharding:
+  jdbc:
+    datasource:
+      names: ds0 #,ds1
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+    #      ds1:
+    #        type: com.alibaba.druid.pool.DruidDataSource
+    #        driver-class-name: com.mysql.jdbc.Driver
+    #        url: jdbc:mysql://localhost:3306/novel_plus2
+    #        username: root
+    #        password: test123456
+    config:
+      sharding:
+        props:
+          sql.show: true
+        tables:
+          book_content:  #book_content表
+            key-generator-column-name: id  #主键
+            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
+            table-strategy:  #分表策略
+              inline:
+                shardingColumn: index_id
+                algorithm-expression: book_content${index_id % 10}
+
+
+
+
 
 
 pic:
   save:
-    type: 2 #图片保存方式, 1不保存，使用网络图片 ，2本地保存
-    path: /var/pic  #图片保存路径
-
-
-
-
+    type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
+    storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
+    path: /var/pic  #图片保存路径

novel-common/src/main/resources/application-common.yml

@@ -11,6 +11,9 @@ spring:
     generator:
       write-numbers-as-strings: true
 
+#缓存类型，ehcache(默认)、redis
+cache:
+  type: ehcache
 
 mybatis:
   configuration:

novel-common/src/main/resources/mybatis/generatorConfig.xml

@@ -9,7 +9,7 @@
         </commentGenerator>
         <jdbcConnection
                 connectionURL="jdbc:mysql://127.0.0.1:3306/novel_plus?tinyInt1isBit=false&amp;useUnicode=true&amp;characterEncoding=utf-8&amp;serverTimezone=Asia/Shanghai&amp;nullCatalogMeansCurrent=true"
-                driverClass="com.mysql.jdbc.Driver" password=""
+                driverClass="com.mysql.jdbc.Driver" password="test123456"
                 userId="root" />
 
         <!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer， 为 true时把JDBC DECIMAL
@@ -44,7 +44,7 @@
         </javaClientGenerator>
 
         <!--生成全部表tableName设为%-->
-        <table tableName="user_buy_record" domainObjectName="UserBuyRecord"/>
+        <table tableName="book"/>
 
         <!-- 指定数据库表 -->
         <!--<table schema="jly" tableName="job_position" domainObjectName="JobPositionTest"/>-->

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.0.1</version>
+        <version>2.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,6 +25,8 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+
+
     </dependencies>
 
     <build>

novel-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java

@@ -3,11 +3,12 @@ package com.java2nb.novel.controller;
 import com.github.pagehelper.PageInfo;
 import com.java2nb.novel.core.bean.ResultBean;
 import com.java2nb.novel.core.utils.BeanUtil;
+import com.java2nb.novel.entity.CrawlSingleTask;
 import com.java2nb.novel.entity.CrawlSource;
 import com.java2nb.novel.service.CrawlService;
+import com.java2nb.novel.vo.CrawlSingleTaskVO;
 import com.java2nb.novel.vo.CrawlSourceVO;
 import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -56,6 +57,38 @@ public class CrawlController {
         return ResultBean.ok();
     }
 
+    /**
+     * 新增单本采集任务
+     * */
+    @PostMapping("addCrawlSingleTask")
+    public ResultBean addCrawlSingleTask(CrawlSingleTask singleTask){
+        crawlService.addCrawlSingleTask(singleTask);
+
+        return ResultBean.ok();
+
+    }
+
+    /**
+     * 单本采集任务分页列表查询
+     * */
+    @PostMapping("listCrawlSingleTaskByPage")
+    public ResultBean listCrawlSingleTaskByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
+
+        return ResultBean.ok(new PageInfo<>(BeanUtil.copyList(crawlService.listCrawlSingleTaskByPage(page,pageSize), CrawlSingleTaskVO.class)
+        ));
+    }
+
+    /**
+     * 删除采集任务
+     * */
+    @PostMapping("delCrawlSingleTask")
+    public ResultBean delCrawlSingleTask(Long id){
+
+        crawlService.delCrawlSingleTask(id);
+
+        return ResultBean.ok();
+    }
+
 
 
 

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,12 @@ public class CrawlParser {
 
                     String desc = bookDetailHtml.substring(bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
                     desc = desc.substring(0, desc.indexOf(ruleBean.getDescEnd()));
+                    //过滤掉简介中的特殊标签
+                    desc = desc.replaceAll("<a[^<]+</a>","")
+                            .replaceAll("<font[^<]+</font>","")
+                            .replaceAll("<p>\\s*</p>","")
+                            .replaceAll("<p>","")
+                            .replaceAll("</p>","<br/>");
                     //设置书籍简介
                     book.setBookDesc(desc);
                     if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@@ -136,8 +157,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 +181,7 @@ public class CrawlParser {
             String lastIndexName = null;
 
             while (isFindIndex) {
+
                 BookIndex hasIndex = hasIndexs.get(indexNum);
                 String indexName = indexNameMatch.group(1);
 
@@ -162,8 +189,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 +208,7 @@ public class CrawlParser {
                         if(hasIndexs.size() == 0){
                             //新书入库
                             //设置目录和章节内容
-                            Long indexId = new IdWorker().nextId();
+                            Long indexId = idWorker.nextId();
                             lastIndexId = indexId;
                             lastIndexName = indexName;
                             bookIndex.setId(indexId);
@@ -214,8 +241,6 @@ public class CrawlParser {
                         }
 
 
-                    } else {
-                        break;
                     }
 
 
@@ -237,4 +262,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;
+    }
+
+
 }

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;
+
+
 }

novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java

@@ -3,10 +3,7 @@ package com.java2nb.novel.core.listener;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.java2nb.novel.core.crawl.CrawlParser;
 import com.java2nb.novel.core.crawl.RuleBean;
-import com.java2nb.novel.entity.Book;
-import com.java2nb.novel.entity.BookContent;
-import com.java2nb.novel.entity.BookIndex;
-import com.java2nb.novel.entity.CrawlSource;
+import com.java2nb.novel.entity.*;
 import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.CrawlService;
 import com.java2nb.novel.utils.Constants;
@@ -40,15 +37,15 @@ public class StarterListener implements ServletContextListener {
 
     @Override
     public void contextInitialized(ServletContextEvent sce) {
-        log.info("程序启动,开始执行自动更新线程。。。");
-        for(int i = 0 ; i<updateThreadCount; i++) {
+        for (int i = 0; i < updateThreadCount; i++) {
             new Thread(() -> {
+                log.info("程序启动,开始执行自动更新线程。。。");
                 while (true) {
                     try {
                         //1.查询最新目录更新时间在一个月之内的前100条需要更新的数据
                         Date currentDate = new Date();
                         Date startDate = DateUtils.addDays(currentDate, -30);
-                        List<Book> bookList ;
+                        List<Book> bookList;
                         synchronized (this) {
                             bookList = bookService.queryNeedUpdateBook(startDate, 100);
                         }
@@ -61,7 +58,7 @@ public class StarterListener implements ServletContextListener {
                                 Book book = CrawlParser.parseBook(ruleBean, needUpdateBook.getCrawlBookId());
                                 //这里只做老书更新
                                 book.setId(needUpdateBook.getId());
-                                if(needUpdateBook.getPicUrl()!=null && needUpdateBook.getPicUrl().startsWith(Constants.LOCAL_PIC_PREFIX)) {
+                                if (needUpdateBook.getPicUrl() != null && needUpdateBook.getPicUrl().contains(Constants.LOCAL_PIC_PREFIX)) {
                                     //本地图片则不更新
                                     book.setPicUrl(null);
                                 }
@@ -83,6 +80,42 @@ public class StarterListener implements ServletContextListener {
 
                 }
             }).start();
+
+
         }
+
+
+        new Thread(() -> {
+            log.info("程序启动,开始执行单本采集任务线程。。。");
+            while (true) {
+                CrawlSingleTask task = null;
+                byte crawlStatus = 0;
+                try {
+                    //获取采集任务
+                    task = crawlService.getCrawlSingleTask();
+
+                    if (task != null) {
+                        //查询爬虫规则
+                        CrawlSource source = crawlService.queryCrawlSource(task.getSourceId());
+                        RuleBean ruleBean = new ObjectMapper().readValue(source.getCrawlRule(), RuleBean.class);
+
+                        if (crawlService.parseBookAndSave(task.getCatId(), ruleBean, task.getSourceId(), task.getSourceBookId())) {
+                            //采集成功
+                            crawlStatus = 1;
+                        }
+
+                    }
+
+                    Thread.sleep(1000 * 60);
+
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
+                if (task != null) {
+                    crawlService.updateCrawlSingleTask(task, crawlStatus);
+                }
+
+            }
+        }).start();
     }
 }

novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java

@@ -1,6 +1,7 @@
 package com.java2nb.novel.service;
 
 import com.java2nb.novel.core.crawl.RuleBean;
+import com.java2nb.novel.entity.CrawlSingleTask;
 import com.java2nb.novel.entity.CrawlSource;
 
 import java.util.List;
@@ -39,6 +40,16 @@ public interface CrawlService {
      * */
     void updateCrawlSourceStatus(Integer sourceId, Byte sourceStatus);
 
+    /**
+     * 采集并保存小说
+     * @param catId 分类ID
+     * @param bookId 小说ID
+     * @param sourceId 源ID
+     * @param ruleBean 采集规则\
+     * @return true:成功，false:失败
+     * */
+    boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId);
+
     /**
      * 根据爬虫状态查询爬虫源集合
      * @param sourceStatus 状态，0关闭，1开启
@@ -61,4 +72,37 @@ public interface CrawlService {
      * @return 源信息
      * */
     CrawlSource queryCrawlSource(Integer sourceId);
+
+    /**
+     * 新增单本采集任务
+     * @param singleTask 任务信息对象
+     * */
+    void addCrawlSingleTask(CrawlSingleTask singleTask);
+
+    /**
+     * 单本采集任务分页列表查询
+     * @param page 当前页码
+     * @param pageSize 分页大小
+     * @return 单本采集任务集合
+     * */
+    List<CrawlSingleTask> listCrawlSingleTaskByPage(int page, int pageSize);
+
+    /**
+     * 删除采集任务
+     * @param id 任务ID
+     * */
+    void delCrawlSingleTask(Long id);
+
+    /**
+     * 获取采集任务
+     * @return 采集任务
+     * */
+    CrawlSingleTask getCrawlSingleTask();
+
+    /**
+     * 更新单本采集任务
+     * @param task 采集任务
+     * @param status 采集状态
+     * */
+    void updateCrawlSingleTask(CrawlSingleTask task, Byte status);
 }

novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java

@@ -6,12 +6,12 @@ import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.crawl.CrawlParser;
 import com.java2nb.novel.core.crawl.RuleBean;
+import com.java2nb.novel.core.enums.ResponseStatus;
+import com.java2nb.novel.core.exception.BusinessException;
 import com.java2nb.novel.core.utils.IdWorker;
 import com.java2nb.novel.core.utils.SpringUtil;
 import com.java2nb.novel.core.utils.ThreadUtil;
-import com.java2nb.novel.entity.Book;
-import com.java2nb.novel.entity.BookContent;
-import com.java2nb.novel.entity.BookIndex;
+import com.java2nb.novel.entity.*;
 import com.java2nb.novel.entity.CrawlSource;
 import com.java2nb.novel.mapper.*;
 import com.java2nb.novel.service.BookService;
@@ -33,8 +33,7 @@ import static com.java2nb.novel.core.utils.HttpUtil.getByHttpClient;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlBookId;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlSourceId;
 import static com.java2nb.novel.mapper.CrawlSourceDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
-import static org.mybatis.dynamic.sql.SqlBuilder.update;
+import static org.mybatis.dynamic.sql.SqlBuilder.*;
 import static org.mybatis.dynamic.sql.select.SelectDSL.select;
 
 /**
@@ -48,6 +47,8 @@ public class CrawlServiceImpl implements CrawlService {
 
     private final CrawlSourceMapper crawlSourceMapper;
 
+    private final CrawlSingleTaskMapper crawlSingleTaskMapper;
+
     private final BookService bookService;
 
 
@@ -140,6 +141,62 @@ public class CrawlServiceImpl implements CrawlService {
         return crawlSourceMapper.selectMany(render).get(0);
     }
 
+    @Override
+    public void addCrawlSingleTask(CrawlSingleTask singleTask) {
+
+        if(bookService.queryIsExistByBookNameAndAuthorName(singleTask.getBookName(),singleTask.getAuthorName())){
+            throw new BusinessException(ResponseStatus.BOOK_EXISTS);
+
+        }
+        singleTask.setCreateTime(new Date());
+        crawlSingleTaskMapper.insertSelective(singleTask);
+
+
+    }
+
+    @Override
+    public List<CrawlSingleTask> listCrawlSingleTaskByPage(int page, int pageSize) {
+        PageHelper.startPage(page, pageSize);
+        SelectStatementProvider render = select(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask.allColumns())
+                .from(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask)
+                .orderBy(CrawlSingleTaskDynamicSqlSupport.createTime.descending())
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+        return crawlSingleTaskMapper.selectMany(render);
+    }
+
+    @Override
+    public void delCrawlSingleTask(Long id) {
+        crawlSingleTaskMapper.deleteByPrimaryKey(id);
+    }
+
+    @Override
+    public CrawlSingleTask getCrawlSingleTask() {
+
+         List<CrawlSingleTask> list = crawlSingleTaskMapper.selectMany(select(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask.allColumns())
+                .from(CrawlSingleTaskDynamicSqlSupport.crawlSingleTask)
+                .where(CrawlSingleTaskDynamicSqlSupport.taskStatus,isEqualTo((byte)2))
+                 .orderBy(CrawlSingleTaskDynamicSqlSupport.createTime)
+                 .limit(1)
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+
+         return list.size() > 0 ? list.get(0) : null;
+    }
+
+    @Override
+    public void updateCrawlSingleTask(CrawlSingleTask task, Byte status) {
+        byte excCount = task.getExcCount();
+        excCount+=1;
+        task.setExcCount(excCount);
+        if(status == 1 || excCount == 5){
+            //当采集成功或者采集次数等于5，则更新采集最终状态，并停止采集
+            task.setTaskStatus(status);
+        }
+        crawlSingleTaskMapper.updateByPrimaryKeySelective(task);
+
+    }
+
     /**
      * 解析分类列表
      */
@@ -167,36 +224,16 @@ public class CrawlServiceImpl implements CrawlService {
                         boolean isFindBookId = bookIdMatcher.find();
                         while (isFindBookId) {
                             try {
-                                String bookId = bookIdMatcher.group(1);
-                                Book book = CrawlParser.parseBook(ruleBean, bookId);
-                                //这里只做新书入库，查询是否存在这本书
-                                Book existBook = bookService.queryBookByBookNameAndAuthorName(book.getBookName(), book.getAuthorName());
-                                //如果该小说不存在，则可以解析入库，但是标记该小说正在入库，30分钟之后才允许再次入库
-                                if (existBook == null) {
-                                    //没有该书，可以入库
-                                    book.setCatId(catId);
-                                    //根据分类ID查询分类
-                                    book.setCatName(bookService.queryCatNameByCatId(catId));
-                                    if (catId == 7) {
-                                        //女频
-                                        book.setWorkDirection((byte) 1);
-                                    } else {
-                                        //男频
-                                        book.setWorkDirection((byte) 0);
-                                    }
-                                    book.setCrawlBookId(bookId);
-                                    book.setCrawlSourceId(sourceId);
-                                    book.setCrawlLastTime(new Date());
-                                    book.setId(new IdWorker().nextId());
-                                    //解析章节目录
-                                    Map<Integer, List> indexAndContentList = CrawlParser.parseBookIndexAndContent(bookId, book, ruleBean, new HashMap<>(0));
-
-                                    bookService.saveBookAndIndexAndContent(book, (List<BookIndex>) indexAndContentList.get(CrawlParser.BOOK_INDEX_LIST_KEY), (List<BookContent>) indexAndContentList.get(CrawlParser.BOOK_CONTENT_LIST_KEY));
-
-                                } else {
-                                    //只更新书籍的爬虫相关字段
-                                    bookService.updateCrawlProperties(existBook.getId(), sourceId, bookId);
+                                //1.阻塞过程（使用了 sleep,同步锁的 wait,socket 中的 receiver,accept 等方法时）
+                                //捕获中断异常InterruptedException来退出线程。
+                                //2.非阻塞过程中通过判断中断标志来退出线程。
+                                if(Thread.currentThread().isInterrupted()){
+                                    return;
                                 }
+
+
+                                String bookId = bookIdMatcher.group(1);
+                                parseBookAndSave(catId, ruleBean, sourceId, bookId);
                             } catch (Exception e) {
                                 log.error(e.getMessage(), e);
                             }
@@ -227,6 +264,43 @@ public class CrawlServiceImpl implements CrawlService {
 
     }
 
+    @Override
+    public boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId) {
+        Book book = CrawlParser.parseBook(ruleBean, bookId);
+        if(book.getBookName() == null || book.getAuthorName() == null){
+            return false;
+        }
+        //这里只做新书入库，查询是否存在这本书
+        Book existBook = bookService.queryBookByBookNameAndAuthorName(book.getBookName(), book.getAuthorName());
+        //如果该小说不存在，则可以解析入库，但是标记该小说正在入库，30分钟之后才允许再次入库
+        if (existBook == null) {
+            //没有该书，可以入库
+            book.setCatId(catId);
+            //根据分类ID查询分类
+            book.setCatName(bookService.queryCatNameByCatId(catId));
+            if (catId == 7) {
+                //女频
+                book.setWorkDirection((byte) 1);
+            } else {
+                //男频
+                book.setWorkDirection((byte) 0);
+            }
+            book.setCrawlBookId(bookId);
+            book.setCrawlSourceId(sourceId);
+            book.setCrawlLastTime(new Date());
+            book.setId(new IdWorker().nextId());
+            //解析章节目录
+            Map<Integer, List> indexAndContentList = CrawlParser.parseBookIndexAndContent(bookId, book, ruleBean, new HashMap<>(0));
+
+            bookService.saveBookAndIndexAndContent(book, (List<BookIndex>) indexAndContentList.get(CrawlParser.BOOK_INDEX_LIST_KEY), (List<BookContent>) indexAndContentList.get(CrawlParser.BOOK_CONTENT_LIST_KEY));
+
+        } else {
+            //只更新书籍的爬虫相关字段
+            bookService.updateCrawlProperties(existBook.getId(), sourceId, bookId);
+        }
+        return true;
+    }
+
     @Override
     public void updateCrawlSourceStatus(Integer sourceId, Byte sourceStatus) {
         CrawlSource source = new CrawlSource();

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;
 }

novel-crawl/src/main/java/com/java2nb/novel/vo/CrawlSingleTaskVO.java

@@ -0,0 +1,26 @@
+package com.java2nb.novel.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.java2nb.novel.entity.CrawlSingleTask;
+import com.java2nb.novel.entity.CrawlSource;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class CrawlSingleTaskVO extends CrawlSingleTask {
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm")
+    private Date createTime;
+
+
+
+
+    @Override
+    public String toString() {
+        return super.toString();
+    }
+}

novel-crawl/src/main/resources/mybatis/mapping/BookMapper.xml

@@ -6,7 +6,7 @@
     <select id="queryNeedUpdateBook" resultType="com.java2nb.novel.entity.Book">
 
         select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url
-        from book where last_index_update_time > #{startDate}
+        from book where last_index_update_time > #{startDate} and crawl_source_id is not null
         order by crawl_last_time
         limit ${limit}
 

novel-crawl/src/main/resources/static/css/user.css

@@ -10,7 +10,7 @@
 .user_l .log_list { width:350px }
 .user_l .s_input { margin-bottom:25px; font-size:14px }
 .s_input { width:348px; height:30px; line-height:38px\9; vertical-align:middle; border:1px solid #ddd; border-radius:2px }
-.icon_name, .icon_key, .icon_code { width:312px; padding-left:36px; background:url(../images/icon_user.png) no-repeat 13px 13px }
+.icon_name, .icon_key, .icon_code { width:312px; padding-left:36px}
 .icon_key { background-position: 13px -51px }
 .icon_code { background-position: 13px -117px; width:200px; float:left }
 .code_pic { height:38px; float:right }
@@ -37,7 +37,7 @@
 .fast_tit .title { background:#fff; font-size:16px; padding:3px 14px; position:relative; display:inline-block; z-index:999 }
 /*userinfo*/
 .my_l { width:198px; float:left; font-size: 13px; padding-top: 20px; }
-.my_l li a { display:block; height:42px; line-height:42px; padding-left:62px; border-left:4px solid #fff; background:url(../images/icon_user.png) no-repeat; margin-bottom:5px; color: #666 }
+.my_l li a { display:block; height:42px; line-height:42px; padding-left:62px; border-left:4px solid #fff;  margin-bottom:5px; color: #666 }
 .my_l li .on { background-color:#fafafa; border-left:2px solid #f80; color:#000; border-radius: 0 2px 2px 0 }
 .my_l .link_1 { background-position:32px -188px }
 .my_l .link_2 { background-position:32px -230px }

novel-crawl/src/main/resources/templates/crawl/crawlSingleTask_add.html

@@ -0,0 +1,188 @@
+<!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>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+        <title>爬虫管理系统-小说精品屋</title>
+        <link rel="stylesheet" href="/css/base.css?v=1"/>
+        <link rel="stylesheet" href="/css/user.css"/>
+    </head>
+</head>
+<body class="">
+
+<div class="header">
+    <div class="mainNav" id="mainNav">
+        <div class="box_center cf"
+             style="text-align: center;height: 44px;line-height: 48px;color: #fff;font-size: 16px;">
+
+            小说精品屋爬虫管理
+
+        </div>
+    </div>
+</div>
+
+<div class="main box_center cf">
+    <div class="userBox cf">
+        <div class="my_l">
+
+            <ul class="log_list">
+                <li><a class="link_1" href="/">爬虫源管理</a></li>
+                <li><a class="link_1 on" href="/crawl/crawlSingleTask_list.html">单本采集管理</a></li>
+                <!--<li><a class="link_1 " href="/user/userinfo.html">批量小说爬取</a></li>
+                <li><a class="link_4 " href="/user/favorites.html">单本小说爬取</a></li>-->
+            </ul>
+
+        </div>
+        <div class="my_r">
+            <div class="my_bookshelf">
+
+                <div class="userBox cf">
+                    <form method="post" action="./register.html" id="form2">
+
+                        <div class="user_l">
+                            <div></div>
+                            <h3>采集信息填写（示例均为笔趣阁：http://www.mcmssc.com）</h3>
+                            <ul class="log_list">
+                                <li><span id="LabErr"></span></li>
+                                <input type="hidden" id="sourceName" class="s_input icon_name" >
+                                <b>采集源:</b>
+                                <li><select id="sourceId" class="s_input icon_key">
+                                </select></li>
+                                <b>采集分类:</b>
+                                <li><select id="catId" class="s_input icon_key">
+                                    <option value="1">玄幻奇幻</option>
+                                    <option value="2">武侠仙侠</option>
+                                    <option value="3">都市言情</option>
+                                    <option value="4">历史军事</option>
+                                    <option value="5">科幻灵异</option>
+                                    <option value="6">网游竞技</option>
+                                    <option value="7">女生频道</option>
+                                </select>
+                                </li>
+                                示例：<b>73_73911</b>
+                                <li><input type="text" id="sourceBookId" class="s_input icon_key"
+                                           placeholder="采集的源站小说ID"/></li>
+                                示例：<b>苏厨</b>
+                                <li><input type="text" id="bookName" class="s_input icon_key"
+                                           placeholder="采集的小说名"/></li>
+                                示例：<b>二子从周</b>
+                                <li><input type="text" id="authorName" class="s_input icon_key"
+                                           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>-->
+
+
+                                <li><input type="button" onclick="addCrawlSingleTask()" name="btnRegister" value="提交"
+                                           id="btnRegister" class="btn_red"></li>
+                            </ul>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+</body>
+<script src="/javascript/jquery-1.8.0.min.js" type="text/javascript"></script>
+<script src="/layui/layui.all.js" type="text/javascript"></script>
+<script src="/javascript/header.js" type="text/javascript"></script>
+<script src="/javascript/user.js" type="text/javascript"></script>
+<script language="javascript" type="text/javascript">
+    $(function () {
+        $.ajax({
+            type: "POST",
+            url: "/crawl/listCrawlByPage",
+            data: {'curr':1,'limit':100},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var crawlSourceList = data.data.list;
+                    if (crawlSourceList.length > 0) {
+                        var crawlSourceListHtml = "";
+                        for(var i=0;i<crawlSourceList.length;i++){
+                            var crawlSource = crawlSourceList[i];
+                            crawlSourceListHtml+=("<option value=\""+crawlSource.id+"\">"+crawlSource.sourceName+"</option>");
+                        }
+                        $("#sourceId").html(crawlSourceListHtml);
+
+
+                    }
+
+
+                } else if (data.code == 1001) {
+                    //未登录
+                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                }else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+    });
+
+
+    function addCrawlSingleTask() {
+
+        var sourceId = $("#sourceId").find("option:selected").val();
+
+        var catId = $("#catId").find("option:selected").val();
+
+        var sourceName = $("#sourceId").find("option:selected").html();
+
+
+        var sourceBookId = $("#sourceBookId").val();
+
+        if (!sourceBookId){
+            layer.alert("采集的源站小说ID不能为空");
+            return;
+        }
+
+        var bookName = $("#bookName").val();
+
+        if (!bookName){
+            layer.alert("采集的小说名不能为空");
+            return;
+        }
+
+        var authorName = $("#authorName").val();
+
+        if (!authorName){
+            layer.alert("采集的小说作者名不能为空");
+            return;
+        }
+
+        $.ajax({
+            type: "POST",
+            url: "/crawl/addCrawlSingleTask",
+            data: {'sourceId': sourceId, 'sourceName': sourceName,'catId':catId,'sourceBookId' : sourceBookId,'bookName':bookName,'authorName':authorName},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+
+                    window.location.href = '/crawl/crawlSingleTask_list.html';
+
+
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+</script>
+</html>

novel-crawl/src/main/resources/templates/crawl/crawlSingleTask_list.html

@@ -0,0 +1,230 @@
+<!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>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+        <title>爬虫管理系统-小说精品屋</title>
+        <link rel="stylesheet" href="/css/base.css?v=1"/>
+        <link rel="stylesheet" href="/css/user.css"/>
+    </head>
+</head>
+<body class="">
+
+<div class="header">
+    <div class="mainNav" id="mainNav">
+        <div class="box_center cf"
+             style="text-align: center;height: 44px;line-height: 48px;color: #fff;font-size: 16px;">
+
+            小说精品屋爬虫管理
+
+        </div>
+    </div>
+</div>
+
+<div class="main box_center cf">
+    <div class="userBox cf">
+        <div class="my_l">
+
+            <ul class="log_list">
+                <li><a class="link_1" href="/">爬虫源管理</a></li>
+                <li><a class="link_1 on" href="/crawl/crawlSingleTask_list.html">单本采集管理</a></li>
+                <!-- <li><a class="link_1 " href="/user/userinfo.html">批量小说爬取</a></li>
+                 <li><a class="link_4 " href="/user/favorites.html">单本小说爬取</a></li>-->
+            </ul>
+
+        </div>
+        <div class="my_r">
+            <div class="my_bookshelf">
+                <div class="title cf">
+                    <h2 class="fl">单本采集任务列表</h2>
+                    <div class="fr"><a href="/crawl/crawlSingleTask_add.html" class="btn_red">增加单本采集任务</a></div>
+                </div>
+
+                <div id="divData" class="updateTable">
+                    <table cellpadding="0" cellspacing="0">
+                        <thead>
+                        <tr>
+                            <th class="style">
+                                序号
+                            </th>
+                            <th class="name">
+                                采集小说名
+                            </th>
+                            <th class="name">
+                                采集小说作者名
+                            </th>
+                            <th class="goread">
+                                采集次数
+                            </th>
+                            <th class="goread">
+                                状态
+                            </th>
+                            <th class="name">
+                                创建时间
+                            </th>
+                            <th class="goread">
+                                操作
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody id="crawlSourceList">
+
+
+                        </tbody>
+                    </table>
+                    <div class="pageBox cf" id="shellPage">
+                    </div>
+                </div>
+                <!--<div id="divData" class="updateTable">
+                    <table cellpadding="0" cellspacing="0">
+                        <thead>
+                        <tr>
+
+                            <th class="name">
+                                爬虫源（已开启的爬虫源）
+                            </th>
+                            <th class="chapter">
+                                成功爬取数量（websocket实现）
+                            </th>
+                            <th class="time">
+                            目标爬取数量
+                            </th>
+                            <th class="goread">
+                                状态（正在运行，已停止）（一次只能运行一个爬虫源）
+                            </th>
+                            <th class="goread">
+                                操作（启动，停止）
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody id="bookShelfList">
+
+
+
+                        </tbody>
+                    </table>
+                    <div class="pageBox cf" id="shellPage">
+                    </div>
+                </div>-->
+            </div>
+        </div>
+    </div>
+</div>
+
+
+</body>
+<script src="/javascript/jquery-1.8.0.min.js" type="text/javascript"></script>
+<script src="/layui/layui.all.js" type="text/javascript"></script>
+<script src="/javascript/header.js" type="text/javascript"></script>
+<script src="/javascript/user.js" type="text/javascript"></script>
+<script language="javascript" type="text/javascript">
+    search(1, 10);
+
+    function search(curr, limit) {
+
+        $.ajax({
+            type: "POST",
+            url: "/crawl/listCrawlSingleTaskByPage",
+            data: {'curr': curr, 'limit': limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var crawlSourceList = data.data.list;
+                    if (crawlSourceList.length > 0) {
+                        var crawlSourceListHtml = "";
+                        for (var i = 0; i < crawlSourceList.length; i++) {
+                            var crawlSource = crawlSourceList[i];
+                            crawlSourceListHtml += (" <tr class=\"book_list\" vals=\"291\">\n" +
+                                "                            <td class=\"style bookclass\">\n" +
+                                "                                [" + (i + 1) + "]\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"name\">\n" +
+                                "                                " + crawlSource.bookName + "\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"name\">\n" +
+                                "                                " + crawlSource.authorName + "\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"goread\">\n" +
+                                "                                " + crawlSource.excCount + "\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"goread\">\n" +
+                                "                                " + (crawlSource.taskStatus == 0 ? '采集失败' : (crawlSource.taskStatus == 1 ? '采集成功' : (crawlSource.excCount>0?'采集中':'排队中'))) + "\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"name\" valsc=\"291|2037554|1\">"
+                                + crawlSource.createTime + "</td>\n" +
+
+                                " <td class=\"goread\" id='opt" + crawlSource.id + "'><a href='javascript:del(" + crawlSource.id + ")'>删除  </a></td>                     </tr>");
+                        }
+                        $("#crawlSourceList").html(crawlSourceListHtml);
+
+                        layui.use('laypage', function () {
+                            var laypage = layui.laypage;
+
+                            //执行一个laypage实例
+                            laypage.render({
+                                elem: 'shellPage' //注意，这里的 test1 是 ID，不用加 # 号
+                                , count: data.data.total //数据总数，从服务端得到,
+                                , curr: data.data.pageNum
+                                , limit: data.data.pageSize
+                                , jump: function (obj, first) {
+
+
+                                    //obj包含了当前分页的所有参数，比如：
+                                    console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
+                                    console.log(obj.limit); //得到每页显示的条数
+
+
+                                    //首次不执行
+                                    if (!first) {
+                                        search(obj.curr, obj.limit);
+                                    } else {
+
+                                    }
+                                }
+                            });
+                        });
+
+                    }
+
+
+                }  else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function del(id) {
+
+        $.ajax({
+            type: "POST",
+            url: "/crawl/delCrawlSingleTask",
+            data: {'id': id},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    location.reload();
+
+
+                } else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+
+    }
+</script>
+</html>

novel-crawl/src/main/resources/templates/crawl/crawlSource_add.html

@@ -29,6 +29,7 @@
 
             <ul class="log_list">
                 <li><a class="link_1 on" href="/">爬虫源管理</a></li>
+                <li><a class="link_1" href="/crawl/crawlSingleTask_list.html">单本采集管理</a></li>
                 <!--<li><a class="link_1 " href="/user/userinfo.html">批量小说爬取</a></li>
                 <li><a class="link_4 " href="/user/favorites.html">单本小说爬取</a></li>-->
             </ul>
@@ -57,6 +58,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 +99,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 +132,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 +288,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 +361,13 @@
 
         crawlRule.bookIndexUrl = bookIndexUrl;
 
+
+        var bookIndexStart = $("#bookIndexStart").val();
+
+        if (bookIndexStart.length > 0) {
+            crawlRule.bookIndexStart = bookIndexStart;
+        }
+
         var indexIdPatten = $("#indexIdPatten").val();
 
         if (indexIdPatten.length == 0) {

novel-crawl/src/main/resources/templates/crawl/crawlSource_list.html

@@ -28,6 +28,7 @@
 
             <ul class="log_list">
                 <li><a class="link_1 on" href="/">爬虫源管理</a></li>
+                <li><a class="link_1" href="/crawl/crawlSingleTask_list.html">单本采集管理</a></li>
                <!-- <li><a class="link_1 " href="/user/userinfo.html">批量小说爬取</a></li>
                 <li><a class="link_4 " href="/user/favorites.html">单本小说爬取</a></li>-->
             </ul>

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.0.1</version>
+        <version>2.9.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -27,11 +27,57 @@
             <version>${jjwt.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>io.searchbox</groupId>
+            <artifactId>jest</artifactId>
+            <version>${jest.version}</version>
+        </dependency>
+
+        <!--aliyunOSS-->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>${aliyun-sdk-oss.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>${commons-fileupload.version}</version>
+        </dependency>
+
+        <!--FastDfs-->
+        <dependency>
+            <groupId>com.github.tobato</groupId>
+            <artifactId>fastdfs-client</artifactId>
+            <version>${fastdfs-client.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+        </dependency>
+
+
+
+
+        <!--引入redisson分布式锁-->
+       <!-- <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+            <version>${redisson.version}</version>
+        </dependency>-->
+
 
         <dependency>
             <groupId>com.alipay.sdk</groupId>
             <artifactId>alipay-sdk-java</artifactId>
-            <version>4.9.153.ALL</version>
+            <version>${alipay-sdk-java.version}</version>
         </dependency>
     </dependencies>
 

novel-front/src/main/java/com/java2nb/novel/FrontNovelApplication.java

@@ -1,10 +1,13 @@
 package com.java2nb.novel;
 
+import com.github.tobato.fastdfs.FdfsClientConfig;
+import io.shardingsphere.shardingjdbc.spring.boot.SpringBootConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.TaskScheduler;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -18,6 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableScheduling
 @EnableCaching
 @MapperScan(basePackages = {"com.java2nb.novel.mapper"})
+@Import(FdfsClientConfig.class)
 public class FrontNovelApplication {
 
     public static void main(String[] args) {

novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java

@@ -2,7 +2,9 @@ package com.java2nb.novel.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.core.bean.UserDetails;
 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.entity.Author;
 import com.java2nb.novel.entity.Book;
@@ -18,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 
 /**
  * @author 11797
@@ -55,18 +58,14 @@ 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());
-
-        //判断作者状态是否正常
-        if(author.getStatus()==1){
-            //封禁状态，不能发布小说
-            return ResultBean.fail(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
-
-        }
+        Author author = checkAuthor(request);
 
+        //bookDesc不能使用book对象来接收，否则会自动去掉前面的空格
+        book.setBookDesc(bookDesc
+                .replaceAll("\\n","<br>")
+                .replaceAll("\\s","&nbsp;"));
         //发布小说
         bookService.addBook(book,author.getId(),author.getPenName());
 
@@ -78,14 +77,7 @@ public class AuthorController extends BaseController{
      * */
     @PostMapping("updateBookStatus")
     public ResultBean updateBookStatus(Long bookId,Byte status,HttpServletRequest request){
-        //查询作家信息
-        Author author = authorService.queryAuthor(getUserDetails(request).getId());
-
-        //判断作者状态是否正常
-        if(author.getStatus()==1){
-            //封禁状态，不能发布小说
-            return ResultBean.fail(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
-        }
+        Author author = checkAuthor(request);
 
         //更新小说状态,上架或下架
         bookService.updateBookStatus(bookId,status,author.getId());
@@ -96,21 +88,29 @@ public class AuthorController extends BaseController{
 
 
     /**
-     * 发布章节内容
-     * */
-    @PostMapping("addBookContent")
-    public ResultBean addBookContent(Long bookId,String indexName,String content,HttpServletRequest request){
-        //查询作家信息
-        Author author = authorService.queryAuthor(getUserDetails(request).getId());
+     * 删除章节
+     */
+    @PostMapping("deleteIndex")
+    public ResultBean deleteIndex(Long indexId,  HttpServletRequest request) {
 
-        //判断作者状态是否正常
-        if(author.getStatus()==1){
-            //封禁状态，不能发布小说
-            return ResultBean.fail(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
-        }
+        Author author = checkAuthor(request);
 
-        //发布章节内容
-        bookService.addBookContent(bookId,indexName,content,author.getId());
+        //删除章节
+        bookService.deleteIndex(indexId, author.getId());
+
+        return ResultBean.ok();
+    }
+
+    /**
+     * 更新章节名
+     */
+    @PostMapping("updateIndexName")
+    public ResultBean updateIndexName(Long indexId,  String indexName, HttpServletRequest request) {
+
+        Author author = checkAuthor(request);
+
+        //更新章节名
+        bookService.updateIndexName(indexId, indexName, author.getId());
 
         return ResultBean.ok();
     }
@@ -118,4 +118,104 @@ public class AuthorController extends BaseController{
 
 
 
+    /**
+     * 发布章节内容
+     */
+    @PostMapping("addBookContent")
+    public ResultBean addBookContent(Long bookId, String indexName, String content,Byte isVip, HttpServletRequest request) {
+        Author author = checkAuthor(request);
+
+        content = content.replaceAll("\\n", "<br>")
+                .replaceAll("\\s", "&nbsp;");
+        //发布章节内容
+        bookService.addBookContent(bookId, indexName, content,isVip, author.getId());
+
+        return ResultBean.ok();
+    }
+
+    /**
+     * 查询章节内容
+     */
+    @PostMapping("queryIndexContent")
+    public ResultBean queryIndexContent(Long indexId,  HttpServletRequest request) {
+
+        Author author = checkAuthor(request);
+
+        String content = bookService.queryIndexContent(indexId, author.getId());
+
+        content = content.replaceAll("<br>", "\n")
+                .replaceAll("&nbsp;", " ");
+
+        return ResultBean.ok(content);
+    }
+
+    /**
+     * 更新章节内容
+     */
+    @PostMapping("updateBookContent")
+    public ResultBean updateBookContent(Long indexId, String indexName, String content, HttpServletRequest request) {
+        Author author = checkAuthor(request);
+
+        content = content.replaceAll("\\n", "<br>")
+                .replaceAll("\\s", "&nbsp;");
+        //更新章节内容
+        bookService.updateBookContent(indexId, indexName, content, author.getId());
+
+        return ResultBean.ok();
+    }
+
+    /**
+     * 作家日收入统计数据分页列表查询
+     * */
+    @PostMapping("listIncomeDailyByPage")
+    public ResultBean listIncomeDailyByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+                                            @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
+                                            @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
+                                            @RequestParam(value = "startTime",defaultValue = "2020-05-01") Date startTime,
+                                            @RequestParam(value = "endTime",defaultValue = "2030-01-01") Date endTime,
+                                            HttpServletRequest request){
+
+        return ResultBean.ok(new PageInfo<>(authorService.listIncomeDailyByPage(page,pageSize,getUserDetails(request).getId(),bookId,startTime,endTime)
+        ));
+    }
+
+
+    /**
+     * 作家月收入统计数据分页列表查询
+     * */
+    @PostMapping("listIncomeMonthByPage")
+    public ResultBean listIncomeMonthByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+                                            @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
+                                            @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
+                                            HttpServletRequest request){
+
+        return ResultBean.ok(new PageInfo<>(authorService.listIncomeMonthByPage(page,pageSize,getUserDetails(request).getId(),bookId)
+        ));
+    }
+
+    private Author checkAuthor(HttpServletRequest request) {
+
+        UserDetails userDetails = getUserDetails(request);
+        if (userDetails == null) {
+            throw new BusinessException(ResponseStatus.NO_LOGIN);
+        }
+
+        //查询作家信息
+        Author author = authorService.queryAuthor(userDetails.getId());
+
+        //判断作者状态是否正常
+        if (author.getStatus() == 1) {
+            //封禁状态，不能发布小说
+            throw new BusinessException(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
+        }
+
+
+        return author;
+
+
+    }
+
+
+
+
 }

novel-front/src/main/java/com/java2nb/novel/controller/BookController.java

@@ -4,14 +4,14 @@ import com.github.pagehelper.PageInfo;
 import com.java2nb.novel.core.bean.ResultBean;
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.enums.ResponseStatus;
-import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookComment;
-import com.java2nb.novel.entity.BookIndex;
 import com.java2nb.novel.search.BookSP;
 import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.vo.BookVO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,6 +32,11 @@ public class BookController extends BaseController{
 
     private final BookService bookService;
 
+    private final RabbitTemplate rabbitTemplate;
+
+    @Value("${spring.rabbitmq.enable}")
+    private Integer enableMq;
+
 
     /**
      * 查询首页小说设置列表数据
@@ -79,8 +83,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);
     }
 
     /**
@@ -105,7 +109,11 @@ public class BookController extends BaseController{
      * */
     @PostMapping("addVisitCount")
     public ResultBean addVisitCount(Long bookId){
-        bookService.addVisitCount(bookId);
+        if(enableMq == 1) {
+            rabbitTemplate.convertAndSend("ADD-BOOK-VISIT-EXCHANGE", null, bookId);
+        }else {
+            bookService.addVisitCount(bookId, 1);
+        }
         return ResultBean.ok();
     }
 
@@ -159,7 +167,15 @@ public class BookController extends BaseController{
      * */
     @PostMapping("queryNewIndexList")
     public ResultBean queryNewIndexList(Long bookId){
-       return ResultBean.ok(bookService.queryIndexList(bookId,"index_num desc",10));
+        return ResultBean.ok(bookService.queryIndexList(bookId,"index_num desc",1,10));
+    }
+
+    /**
+     * 目录页
+     * */
+    @PostMapping("/queryIndexList")
+    public ResultBean indexList(Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,@RequestParam(value = "orderBy") String orderBy) {
+        return ResultBean.ok(new PageInfo<>(bookService.queryIndexList(bookId,orderBy,page,pageSize)));
     }
 
 

novel-front/src/main/java/com/java2nb/novel/controller/FileController.java

@@ -1,17 +1,32 @@
 package com.java2nb.novel.controller;
 
+import com.java2nb.novel.core.bean.ResultBean;
 import com.java2nb.novel.core.cache.CacheService;
+import com.java2nb.novel.core.utils.Constants;
 import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
+import com.java2nb.novel.core.utils.RestTemplateUtil;
+import com.java2nb.novel.core.utils.UUIDUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.Charsets;
+import org.apache.http.client.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.*;
+import java.util.Date;
+import java.util.Objects;
 
 /**
  * @author 11797
@@ -24,6 +39,9 @@ public class FileController {
 
     private final CacheService cacheService;
 
+    @Value("${pic.save.path}")
+    private String picSavePath;
+
     /**
      * 生成验证码
      */
@@ -44,5 +62,32 @@ public class FileController {
         }
     }
 
+    /**
+     * 文件上传
+     */
+    @ResponseBody
+    @PostMapping("/upload")
+    ResultBean upload(@RequestParam("file") MultipartFile file) {
+        Date currentDate = new Date();
+        try {
+            String savePath =
+                    Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
+                    DateUtils.formatDate(currentDate, "MM") + "/" +
+                    DateUtils.formatDate(currentDate, "dd") ;
+            String oriName = file.getOriginalFilename();
+            String saveFileName = UUIDUtil.getUUID32() + oriName.substring(oriName.lastIndexOf("."));
+            File saveFile = new File( picSavePath + savePath, saveFileName);
+            if (!saveFile.getParentFile().exists()) {
+                saveFile.getParentFile().mkdirs();
+            }
+            file.transferTo(saveFile);
+            return ResultBean.ok(savePath+"/"+saveFileName);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return ResultBean.error();
+        }
+
+    }
+
 
 }

novel-front/src/main/java/com/java2nb/novel/controller/PageController.java

@@ -101,9 +101,11 @@ public class PageController extends BaseController{
     public String bookDetail(@PathVariable("bookId") Long bookId, Model model) {
         Book book = bookService.queryBookDetail(bookId);
         model.addAttribute("book",book);
-        //查询首章目录ID
-        Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId);
-        model.addAttribute("firstBookIndexId",firstBookIndexId);
+        if(book.getLastIndexId() != null) {
+            //查询首章目录ID
+            Long firstBookIndexId = bookService.queryFirstBookIndexId(bookId);
+            model.addAttribute("firstBookIndexId", firstBookIndexId);
+        }
         return ThreadLocalUtil.getTemplateDir()+"book/book_detail";
     }
 
@@ -114,7 +116,7 @@ public class PageController extends BaseController{
     public String indexList(@PathVariable("bookId") Long bookId, Model model) {
         Book book = bookService.queryBookDetail(bookId);
         model.addAttribute("book",book);
-        List<BookIndex> bookIndexList = bookService.queryIndexList(bookId,null,null);
+        List<BookIndex> bookIndexList = bookService.queryIndexList(bookId,null,1,null);
         model.addAttribute("bookIndexList",bookIndexList);
         model.addAttribute("bookIndexCount",bookIndexList.size());
         return ThreadLocalUtil.getTemplateDir()+"book/book_index";
@@ -140,6 +142,8 @@ public class PageController extends BaseController{
         //查询内容
         BookContent bookContent = bookService.queryBookContent(bookIndex.getId());
         model.addAttribute("bookContent",bookContent);
+
+        boolean needBuy = false;
         //判断该目录是否收费
         if(bookIndex.getIsVip()!=null && bookIndex.getIsVip() == 1 ){
             UserDetails user = getUserDetails(request);
@@ -152,11 +156,10 @@ public class PageController extends BaseController{
             if(!isBuy){
                 //没有购买过，需要购买
                 bookContent.setContent(null);
-                model.addAttribute("needBuy",true);
-                return "book/book_content";
+                needBuy = true;
             }
         }
-        model.addAttribute("needBuy",false);
+        model.addAttribute("needBuy",needBuy);
         return ThreadLocalUtil.getTemplateDir()+"book/book_content";
     }
 

novel-front/src/main/java/com/java2nb/novel/controller/UserController.java

@@ -282,6 +282,7 @@ public class UserController extends BaseController {
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
         }
+        buyRecord.setBuyAmount(bookService.queryBookIndex(buyRecord.getBookIndexId()).getBookPrice());
         userService.buyBookIndex(userDetails.getId(),buyRecord);
         return ResultBean.ok();
     }

novel-front/src/main/java/com/java2nb/novel/core/config/AuthorIncomeConfig.java

@@ -0,0 +1,24 @@
+package com.java2nb.novel.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * 作家收入配置
+ * @author cd
+ */
+@Component
+@Data
+@ConfigurationProperties(prefix = "author.income")
+public class AuthorIncomeConfig {
+
+    private BigDecimal taxRate;
+
+    private BigDecimal shareProportion;
+
+    private BigDecimal exchangeProportion;
+
+}

novel-front/src/main/java/com/java2nb/novel/core/config/BookPriceConfig.java

@@ -0,0 +1,23 @@
+package com.java2nb.novel.core.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * 章节费用配置
+ * @author cd
+ */
+@Component
+@Data
+@ConfigurationProperties(prefix = "book.price")
+public class BookPriceConfig {
+
+    private BigDecimal wordCount;
+
+    private BigDecimal value;
+
+
+}

novel-front/src/main/java/com/java2nb/novel/core/config/FdfsConfiguration.java

@@ -0,0 +1,13 @@
+package com.java2nb.novel.core.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.EnableMBeanExport;
+import org.springframework.jmx.support.RegistrationPolicy;
+
+/**
+ * @author 11797
+ */
+@Configuration
+@EnableMBeanExport(registration= RegistrationPolicy.IGNORE_EXISTING)
+public class FdfsConfiguration {
+}

novel-front/src/main/java/com/java2nb/novel/core/config/OssProperties.java

@@ -0,0 +1,30 @@
+package com.java2nb.novel.core.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 11797
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix="novel.file")
+public class OssProperties{
+
+    private String endpoint;
+
+    private String keyId;
+
+    private String keySecret;
+
+    private String fileHost;
+
+    private String bucketName;
+
+    private String webUrl;
+
+
+}

novel-front/src/main/java/com/java2nb/novel/core/config/RabbitConfig.java

@@ -0,0 +1,59 @@
+package com.java2nb.novel.core.config;
+
+import org.springframework.amqp.core.*;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author 11797
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "spring.rabbitmq", name = "enable", havingValue = "1")
+public class RabbitConfig {
+
+
+    /**
+     * 更新数据库队列
+     */
+    @Bean
+    public Queue updateDbQueue() {
+        return new Queue("UPDATE-DB-QUEUE", true);
+    }
+
+    /**
+     * 更新数据库队列
+     */
+    @Bean
+    public Queue updateEsQueue() {
+        return new Queue("UPDATE-ES-QUEUE", true);
+    }
+
+
+    /**
+     * 增加点击量交换机
+     */
+    @Bean
+    public FanoutExchange addVisitExchange() {
+        return new FanoutExchange("ADD-BOOK-VISIT-EXCHANGE");
+    }
+
+    /**
+     * 更新搜索引擎队列绑定到增加点击量交换机中
+     */
+    @Bean
+    public Binding updateEsBinding() {
+
+        return BindingBuilder.bind(updateEsQueue()).to(addVisitExchange());
+    }
+
+    /**
+     * 更新数据库绑定到增加点击量交换机中
+     */
+    @Bean
+    public Binding updateDbBinding() {
+        return BindingBuilder.bind(updateDbQueue()).to(addVisitExchange());
+    }
+
+
+}

novel-front/src/main/java/com/java2nb/novel/core/config/WebMvcConfig.java

@@ -0,0 +1,18 @@
+package com.java2nb.novel.core.config;
+
+import com.java2nb.novel.core.converter.DateConverter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+
+/**
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class WebMvcConfig extends WebMvcConfigurerAdapter {
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        registry.addConverter(new DateConverter());
+    }
+}

novel-front/src/main/java/com/java2nb/novel/core/listener/BookVisitAddListener.java

@@ -0,0 +1,107 @@
+package com.java2nb.novel.core.listener;
+
+import com.java2nb.novel.core.cache.CacheKey;
+import com.java2nb.novel.core.cache.CacheService;
+import com.java2nb.novel.core.utils.Constants;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.SearchService;
+import com.java2nb.novel.vo.EsBookVO;
+import com.rabbitmq.client.Channel;
+import io.searchbox.client.JestClient;
+import io.searchbox.core.Index;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.beans.BeanUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Component;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+
+
+import java.text.SimpleDateFormat;
+
+
+/**
+ * @author 11797
+ */
+@Component
+@Slf4j
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "spring.rabbitmq", name = "enable", havingValue = "1")
+public class BookVisitAddListener {
+
+    private final BookService bookService;
+
+    private final CacheService cacheService;
+
+    private final SearchService searchService;
+
+   // private final RedissonClient redissonClient;
+
+
+
+
+    /**
+     * 更新数据库
+     * 流量削峰，每本小说累积10个点击更新一次
+     */
+    @SneakyThrows
+    @RabbitListener(queues = {"UPDATE-DB-QUEUE"})
+    public void updateDb(Long bookId, Channel channel, Message message) {
+
+        log.debug("收到更新数据库消息：" + bookId);
+        Thread.sleep(1000 * 2);
+        //TODO 操作共享资源visitCount，集群环境下有线程安全问题，引入Redisson框架实现分布式锁
+        //RLock lock = redissonClient.getLock("visitCount");
+        //lock.lock();
+
+
+        //目前visitCount不重要，数据可丢失，暂不实现分布式锁
+        Integer visitCount = (Integer) cacheService.getObject(CacheKey.BOOK_ADD_VISIT_COUNT+bookId);
+        if(visitCount == null){
+            visitCount = 0 ;
+        }
+        cacheService.setObject(CacheKey.BOOK_ADD_VISIT_COUNT+bookId,++visitCount);
+        if(visitCount >= Constants.ADD_MAX_VISIT_COUNT) {
+            bookService.addVisitCount(bookId,visitCount);
+            cacheService.del(CacheKey.BOOK_ADD_VISIT_COUNT+bookId);
+        }
+
+        //TODO 操作共享资源visitCount，集群环境下有线程安全问题，引入Redisson框架实现分布式锁
+        //lock.unlock();
+
+
+
+    }
+
+    /**
+     * 更新搜索引擎
+     * 流量削峰，每本小说1个小时更新一次
+     */
+    @RabbitListener(queues = {"UPDATE-ES-QUEUE"})
+    public void updateEs(Long bookId, Channel channel, Message message) {
+
+        log.debug("收到更新搜索引擎消息：" + bookId);
+        if (cacheService.get(CacheKey.ES_IS_UPDATE_VISIT + bookId) == null) {
+            cacheService.set(CacheKey.ES_IS_UPDATE_VISIT + bookId, "1", 60 * 60);
+            try {
+                Thread.sleep(1000 * 5);
+                Book book = bookService.queryBookDetail(bookId);
+                searchService.importToEs(book);
+            }catch (Exception e){
+                cacheService.del(CacheKey.ES_IS_UPDATE_VISIT + bookId);
+                log.error("更新搜索引擎失败"+bookId);
+            }
+
+
+
+
+        }
+
+
+    }
+
+
+}

novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java

@@ -0,0 +1,87 @@
+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.service.SearchService;
+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 SearchService searchService;
+
+
+    /**
+     * 1分钟导入一次
+     */
+    @Scheduled(fixedRate = 1000 * 60)
+    public void saveToEs() {
+        //TODO 引入Redisson框架实现分布式锁
+        //可以重复更新，只是效率可能略有降低，所以暂不实现分布式锁
+        if (cacheService.get(CacheKey.ES_TRANS_LOCK) == null) {
+            cacheService.set(CacheKey.ES_TRANS_LOCK, "1", 60 * 20);
+            try {
+                //查询需要更新的小说
+                Date lastDate = (Date) cacheService.getObject(CacheKey.ES_LAST_UPDATE_TIME);
+                if (lastDate == null) {
+                    lastDate = new SimpleDateFormat("yyyy-MM-dd").parse("2020-01-01");
+                }
+
+
+                List<Book> books = bookService.queryBookByUpdateTimeByPage(lastDate, 100);
+                for (Book book : books) {
+                    searchService.importToEs(book);
+                    lastDate = book.getUpdateTime();
+                    Thread.sleep(5000);
+
+                }
+
+
+
+                cacheService.setObject(CacheKey.ES_LAST_UPDATE_TIME, lastDate);
+
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+            }
+            cacheService.del(CacheKey.ES_TRANS_LOCK);
+
+
+        }
+
+
+    }
+
+
+}

novel-front/src/main/java/com/java2nb/novel/core/schedule/CrawlPicTransSchedule.java

@@ -1,8 +1,10 @@
 package com.java2nb.novel.core.schedule;
 
+import com.java2nb.novel.core.utils.Constants;
 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;
@@ -12,14 +14,15 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 /**
- * 网络图片转存本地任务
+ * 将爬取的网络图片转存为自己的存储介质（本地、OSS、fastDfs）任务
+ *
  * @author Administrator
  */
-@ConditionalOnProperty(prefix = "pic.save",name = "type",havingValue = "2")
+@ConditionalOnProperty(prefix = "pic.save", name = "type", havingValue = "2")
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class Network2LocalPicSchedule {
+public class CrawlPicTransSchedule {
 
     private final BookService bookService;
 
@@ -33,20 +36,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(Constants.LOCAL_PIC_PREFIX,100);
+        for (Book book : networkPicBooks) {
+            bookService.updateBookPicToLocal(book.getPicUrl(), book.getId());
+            //3秒钟转化一张图片，10分钟转化200张
+            Thread.sleep(3000);
+        }
 
 
     }

novel-front/src/main/java/com/java2nb/novel/core/schedule/DailyIncomeStaSchedule.java

@@ -0,0 +1,142 @@
+package com.java2nb.novel.core.schedule;
+
+
+import com.java2nb.novel.core.config.AuthorIncomeConfig;
+import com.java2nb.novel.core.utils.DateUtil;
+import com.java2nb.novel.entity.Author;
+import com.java2nb.novel.entity.AuthorIncomeDetail;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.service.AuthorService;
+import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.UserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 作家日收入统计任务
+ *
+ * @author cd
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class DailyIncomeStaSchedule {
+
+    private final AuthorService authorService;
+
+    private final UserService userService;
+
+    private final BookService bookService;
+
+
+    /**
+     * 每天凌晨0点统计上一天数据
+     */
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void statistics() {
+
+        //获取昨天的日期时间
+        Date yesterday = DateUtil.getYesterday();
+        //获取昨天的开始时间
+        Date startTime = DateUtil.getDateStartTime(yesterday);
+        //获取昨天的结束时间
+        Date endTime = DateUtil.getDateEndTime(yesterday);
+
+        //每次查询的作家数量
+        int needAuthorNumber = 10;
+        //查询出来的真实作家数量
+        int realAuthorNumber;
+        //每次查询最大申请时间
+        Date maxAuthorCreateTime = new Date();
+        do {
+            //1.查询作家列表
+            List<Author> authors = authorService.queryAuthorList(needAuthorNumber, maxAuthorCreateTime);
+            realAuthorNumber = authors.size();
+            for (Author author : authors) {
+                maxAuthorCreateTime = author.getCreateTime();
+                Long authorId = author.getId();
+                Long userId = author.getUserId();
+                //2.查询作家作品
+                List<Book> books = bookService.queryBookList(authorId);
+
+                int buyTotalMember = 0;
+                int buyTotalCount = 0;
+                int buyTotalAccount = 0;
+                List<Long> bookIds = new ArrayList<>(books.size());
+                for (Book book : books) {
+
+                    Long bookId = book.getId();
+
+                    //3.查询该作家作品昨日的订阅人数
+                    int buyMember = userService.queryBuyMember(bookId, startTime, endTime);
+
+                    int buyCount = 0;
+
+                    int buyAccount = 0;
+
+
+                    if (buyMember > 0) {
+                        //4.查询该作家作品昨日的订阅次数
+                        buyCount = userService.queryBuyCount(bookId, startTime, endTime);
+                        //5.查询该作家作品昨日的订阅总额
+                        buyAccount = userService.queryBuyAccount(bookId, startTime, endTime);
+                    }
+
+                    //6.判断该作家作品昨日收入数据是否统计入库
+                    boolean isStatistics = authorService.queryIsStatisticsDaily(bookId, yesterday);
+                    if (!isStatistics) {
+                        //7.该作家作品昨日收入数据未统计入库,分作品统计数据入库
+                        AuthorIncomeDetail authorIncomeDetail = new AuthorIncomeDetail();
+                        authorIncomeDetail.setAuthorId(authorId);
+                        authorIncomeDetail.setUserId(userId);
+                        authorIncomeDetail.setBookId(bookId);
+                        authorIncomeDetail.setIncomeDate(yesterday);
+                        authorIncomeDetail.setIncomeNumber(buyMember);
+                        authorIncomeDetail.setIncomeCount(buyCount);
+                        authorIncomeDetail.setIncomeAccount(buyAccount);
+                        authorIncomeDetail.setCreateTime(new Date());
+                        authorService.saveDailyIncomeSta(authorIncomeDetail);
+                    }
+
+
+                    buyTotalCount += buyCount;
+                    buyTotalAccount += buyAccount;
+                    bookIds.add(bookId);
+
+                }
+
+                //8.判断该作家所有作品昨日收入数据是否统计入库
+                boolean isStatistics = authorService.queryIsStatisticsDaily(authorId,0L, yesterday);
+                if (!isStatistics) {
+                    if (buyTotalCount > 0) {
+                        //总订阅次数大于0，则订阅人数也大于0
+                        buyTotalMember = userService.queryBuyTotalMember(bookIds, startTime, endTime);
+                    }
+
+                    //9.作家所有作品昨日收入数据统计入库
+                    AuthorIncomeDetail authorIncomeAllDetail = new AuthorIncomeDetail();
+                    authorIncomeAllDetail.setAuthorId(authorId);
+                    authorIncomeAllDetail.setUserId(userId);
+                    authorIncomeAllDetail.setBookId(0L);
+                    authorIncomeAllDetail.setIncomeDate(yesterday);
+                    authorIncomeAllDetail.setIncomeNumber(buyTotalMember);
+                    authorIncomeAllDetail.setIncomeCount(buyTotalCount);
+                    authorIncomeAllDetail.setIncomeAccount(buyTotalAccount);
+                    authorIncomeAllDetail.setCreateTime(new Date());
+                    authorService.saveDailyIncomeSta(authorIncomeAllDetail);
+                }
+
+            }
+
+        } while (needAuthorNumber == realAuthorNumber);
+
+
+    }
+
+}

novel-front/src/main/java/com/java2nb/novel/core/schedule/MonthIncomeStaSchedule.java

@@ -0,0 +1,129 @@
+package com.java2nb.novel.core.schedule;
+
+
+import com.java2nb.novel.core.config.AuthorIncomeConfig;
+import com.java2nb.novel.core.utils.DateUtil;
+import com.java2nb.novel.entity.*;
+import com.java2nb.novel.service.AuthorService;
+import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.UserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 作家日收入统计任务
+ *
+ * @author cd
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class MonthIncomeStaSchedule {
+
+    private final AuthorService authorService;
+
+    private final BookService bookService;
+
+    private final AuthorIncomeConfig authorIncomeConfig;
+
+    /**
+     * 每个月1号凌晨2点统计上个月数据
+     */
+    @Scheduled(cron = "0 0 2 1 * ?")
+    public void statistics() {
+
+        //获取上个月的开始时间和结束时间
+        Date startTime = DateUtil.getLastMonthStartTime();
+        Date endTime = DateUtil.getLastMonthEndTime();
+
+        //每次查询的作家数量
+        int needAuthorNumber = 10;
+        //查询出来的真实作家数量
+        int realAuthorNumber;
+        //每次查询最大申请时间
+        Date maxAuthorCreateTime = new Date();
+        do {
+            //1.查询作家列表
+            List<Author> authors = authorService.queryAuthorList(needAuthorNumber, maxAuthorCreateTime);
+            realAuthorNumber = authors.size();
+            for (Author author : authors) {
+                maxAuthorCreateTime = author.getCreateTime();
+                Long authorId = author.getId();
+                Long userId = author.getUserId();
+                //2.查询作家作品
+                List<Book> books = bookService.queryBookList(authorId);
+
+                Long totalPreTaxIncome = 0L;
+                Long totalAfterTaxIncome = 0L;
+                for (Book book : books) {
+
+                    Long bookId = book.getId();
+
+
+                    //3.月收入数据未统计入库,分作品统计数据入库
+                    Long monthIncome = authorService.queryTotalAccount(userId, bookId, startTime, endTime);
+
+                    BigDecimal monthIncomeShare = new BigDecimal(monthIncome)
+                            .multiply(authorIncomeConfig.getShareProportion());
+                    Long preTaxIncome = monthIncomeShare
+                            .multiply(authorIncomeConfig.getExchangeProportion())
+                            .multiply(new BigDecimal(100))
+                            .longValue();
+
+                    totalPreTaxIncome += preTaxIncome;
+
+                    Long afterTaxIncome = monthIncomeShare
+                            .multiply(authorIncomeConfig.getTaxRate())
+                            .multiply(authorIncomeConfig.getExchangeProportion())
+                            .multiply(new BigDecimal(100))
+                            .longValue();
+
+                    totalAfterTaxIncome += afterTaxIncome;
+
+                    //4.查询月收入统计是否入库
+                    if (monthIncome > 0 && !authorService.queryIsStatisticsMonth(bookId, endTime)) {
+                        AuthorIncome authorIncome = new AuthorIncome();
+                        authorIncome.setAuthorId(authorId);
+                        authorIncome.setUserId(userId);
+                        authorIncome.setBookId(bookId);
+                        authorIncome.setPreTaxIncome(preTaxIncome);
+                        authorIncome.setAfterTaxIncome(afterTaxIncome);
+                        authorIncome.setIncomeMonth(endTime);
+                        authorIncome.setCreateTime(new Date());
+
+                        authorService.saveAuthorIncomeSta(authorIncome);
+                    }
+
+
+                }
+
+                if (totalPreTaxIncome > 0 && !authorService.queryIsStatisticsMonth(0L, endTime)) {
+
+                    AuthorIncome authorIncome = new AuthorIncome();
+                    authorIncome.setAuthorId(authorId);
+                    authorIncome.setUserId(userId);
+                    authorIncome.setBookId(0L);
+                    authorIncome.setPreTaxIncome(totalPreTaxIncome);
+                    authorIncome.setAfterTaxIncome(totalAfterTaxIncome);
+                    authorIncome.setIncomeMonth(endTime);
+                    authorIncome.setCreateTime(new Date());
+
+                    authorService.saveAuthorIncomeSta(authorIncome);
+                }
+
+
+            }
+
+        } while (needAuthorNumber == realAuthorNumber);
+
+
+    }
+
+}

novel-front/src/main/java/com/java2nb/novel/core/utils/BrowserUtil.java

@@ -18,19 +18,20 @@ public class BrowserUtil {
             "lg-d", "lg-g", "lge-", "maui", "maxo", "midp", "mits", "mmef", "mobi", "mot-", "moto", "mwbp", "nec-",
             "newt", "noki", "oper", "palm", "pana", "pant", "phil", "play", "port", "prox", "qwap", "sage", "sams",
             "sany", "sch-", "sec-", "send", "seri", "sgh-", "shar", "sie-", "siem", "smal", "smar", "sony", "sph-",
-            "symb", "t-mo", "teli", "tim-", "tosh", "tsm-", "upg1", "upsi", "vk-v", "voda", "wap-", "wapa", "wapi",
+            "symb", "t-mo", "teli", "tim-",  "tsm-", "upg1", "upsi", "vk-v", "voda", "wap-", "wapa", "wapi",
             "wapp", "wapr", "webc", "winw", "winw", "xda", "xda-", "Googlebot-Mobile" };
 
     /**
      *
-     * @Title: JudgelsMobile @Description: TODO(判断是否是手机浏览器) @param @param
-     *         request @param @return 设定文件 @return boolean 返回类型 @throws
+     * 判断是否是手机浏览器
      */
     public static boolean isMobile(HttpServletRequest request) {
         boolean isMobile = false;
-        if (request.getHeader("User-Agent") != null) {
+        String userAgent = request.getHeader("User-Agent");
+        if (userAgent != null) {
+            userAgent = userAgent.toLowerCase();
             for (String mobileAgent : mobileAgents) {
-                if (request.getHeader("User-Agent").toLowerCase().indexOf(mobileAgent) > 0) {
+                if (userAgent.indexOf(mobileAgent) > 0) {
                     isMobile = true;
                     break;
                 }

novel-front/src/main/java/com/java2nb/novel/core/utils/Constants.java

@@ -12,7 +12,7 @@ public class Constants {
     public static final String TEMPLATE_PATH_PREFIX_KEY = "templatePathPrefixKey";
 
     /**
-     * 本地图片保存前缀
+     * 保存图片到自己的存储介质路径前缀
      * */
     public static final String LOCAL_PIC_PREFIX = "/localPic/";
 
@@ -30,4 +30,9 @@ public class Constants {
      * 首页设置的小说数量
      * */
     public static final int INDEX_BOOK_SETTING_NUM = 32;
+
+    /**
+     * 累积的最大点击量
+     * */
+    public static final Integer ADD_MAX_VISIT_COUNT = 10;
 }

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("visitCount") Integer visitCount);
 
     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("localPicPrefix") String localPicPrefix, @Param("limit") Integer limit);
 
     /**
      * 按评分随机查询小说集合

novel-front/src/main/java/com/java2nb/novel/service/AuthorService.java

@@ -2,8 +2,11 @@ package com.java2nb.novel.service;
 
 
 import com.java2nb.novel.entity.Author;
+import com.java2nb.novel.entity.AuthorIncome;
+import com.java2nb.novel.entity.AuthorIncomeDetail;
 import com.java2nb.novel.entity.FriendLink;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -39,4 +42,87 @@ public interface AuthorService {
      * @return 作家对象
      * */
     Author queryAuthor(Long userId);
+
+    /**
+     * 查询作家列表
+     * @return 作家列表
+     * @param limit 查询条数
+     * @param maxAuthorCreateTime 最大申请时间
+     */
+    List<Author> queryAuthorList(int limit, Date maxAuthorCreateTime);
+
+    /**
+     * 查询收入日统计是否入库
+     * @param bookId 作品ID
+     * @param date 收入时间
+     * @return true:已入库，false：未入库
+     */
+    boolean queryIsStatisticsDaily(Long bookId, Date date);
+
+
+    /**
+     * 保存日收入统计(按作品)
+     * @param authorIncomeDetail 收入详情
+     * */
+    void saveDailyIncomeSta(AuthorIncomeDetail authorIncomeDetail);
+
+
+
+    /**
+     * 查询月收入统计是否入库
+     * @param bookId 作品ID
+     * @param incomeDate 收入时间
+     * @return true:已入库，false：未入库
+     * */
+    boolean queryIsStatisticsMonth(Long bookId, Date incomeDate);
+
+    /**
+     * 查询时间段内总订阅额
+     *
+     * @param userId
+     * @param bookId 作品ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 订阅额（屋币）
+     * */
+    Long queryTotalAccount(Long userId, Long bookId, Date startTime, Date endTime);
+
+
+    /**
+     * 保存月收入统计
+     * @param authorIncome 收入详情
+     * */
+    void saveAuthorIncomeSta(AuthorIncome authorIncome);
+
+    /**
+     * 查询收入日统计是否入库
+     * @param authorId 作家ID
+     * @param bookId 作品ID
+     * @param date 收入时间
+     * @return true:已入库，false：未入库
+     */
+    boolean queryIsStatisticsDaily(Long authorId, Long bookId, Date date);
+
+    /**
+     *作家日收入统计数据分页列表查询
+     * @param userId
+     * @param page 页码
+     * @param pageSize 分页大小
+     * @param bookId 小说ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 日收入统计数据列表
+     */
+    List<AuthorIncomeDetail> listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime);
+
+
+    /**
+     * 作家月收入统计数据分页列表查询
+     * @param page 页码
+     * @param pageSize 分页大小
+     * @param userId 用户ID
+     * @param bookId 小说ID
+     * @return
+     * */
+    List<AuthorIncome> listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId);
 }

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);
 
     /**
      * 查询小说分类列表
@@ -64,10 +66,12 @@ public interface BookService {
      * 查询目录列表
      * @param bookId 书籍ID
      * @param orderBy 排序
-     *@param limit 查询条数
+     * @param page 查询页码
+     *@param pageSize 分页大小
      *@return 目录集合
      * */
-    List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer limit);
+    List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer page, Integer pageSize);
+
 
     /**
      * 查询目录
@@ -110,8 +114,8 @@ public interface BookService {
     /**
      * 增加点击次数
      * @param bookId 书籍ID
-     * */
-    void addVisitCount(Long bookId);
+     * @param visitCount*/
+    void addVisitCount(Long bookId, Integer visitCount);
 
     /**
      * 查询章节数
@@ -178,16 +182,17 @@ public interface BookService {
 
     /**
      * 查询网络图片的小说
+     *
+     * @param localPicPrefix
      * @param limit 查询条数
-     * @param offset 开始行数
      * @return 返回小说集合
      * */
-    List<Book> queryNetworkPicBooks(Integer limit, Integer offset);
+    List<Book> queryNetworkPicBooks(String localPicPrefix, Integer limit);
 
 
     /**
-     * 更新小说网络图片到本地
-     * @param picUrl 网络图片路径
+     * 更新爬取的小说网络图片到自己的存储介质（本地、OSS、fastDfs）
+     * @param picUrl 爬取的网络图片路径
      * @param bookId 小说ID
      */
     void updateBookPicToLocal(String picUrl, Long bookId);
@@ -197,6 +202,7 @@ public interface BookService {
      * @param userId 用户ID
      * @param page 页码
      * @param pageSize 分页大小
+     * @return 小说集合
      * */
     List<Book> listBookPageByUserId(Long userId, int page, int pageSize);
 
@@ -221,7 +227,55 @@ public interface BookService {
      * @param bookId 小说ID
      * @param indexName 章节名
      * @param content 章节内容
-     * @param authorId 作者ID
+     * @param isVip 是否收费
+     * @param authorId 作者ID   */
+    void addBookContent(Long bookId, String indexName, String content, Byte isVip, Long authorId);
+
+
+    /**
+     * 根据更新时间分页查询书籍列表
+     * @param startDate 开始时间，包括该时间
+     * @param limit 查询数量
+     * @return 书籍列表
      * */
-    void addBookContent(Long bookId, String indexName, String content, Long authorId);
+    List<Book> queryBookByUpdateTimeByPage(Date startDate, int limit);
+
+    /**
+     * 查询作品列表
+     * @param authorId 作家ID
+     * @return 作品列表
+     */
+    List<Book> queryBookList(Long authorId);
+
+    /**
+     * 删除章节
+     * @param indexId
+     * @param authorId 作家ID
+     */
+    void deleteIndex(Long indexId, Long authorId);
+
+    /**
+     * 更新章节名
+     * @param indexId
+     * @param indexName
+     * @param authorId
+     */
+    void updateIndexName(Long indexId, String indexName, Long authorId);
+
+    /**
+     * 查询章节内容
+     * @param indexId
+     * @param authorId
+     * @return
+     */
+    String queryIndexContent(Long indexId, Long authorId);
+
+    /**
+     *  更新章节内容
+     * @param indexId
+     * @param indexName
+     * @param content
+     * @param authorId
+     */
+    void updateBookContent( Long indexId, String indexName, String content, Long authorId);
 }

novel-front/src/main/java/com/java2nb/novel/service/FileService.java

@@ -0,0 +1,17 @@
+package com.java2nb.novel.service;
+
+
+/**
+ * @author 11797
+ */
+public interface FileService {
+
+    /**
+     * 将爬取的网络图片转存为自己的存储介质（本地、OSS、fastDfs）
+     * @param picSrc 爬取的网络图片路径
+     * @param picSavePath 保存路径
+     * @return 新图片地址
+     * */
+    String transFile(String picSrc, String picSavePath);
+
+}

novel-front/src/main/java/com/java2nb/novel/service/SearchService.java

@@ -0,0 +1,27 @@
+package com.java2nb.novel.service;
+
+
+import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.search.BookSP;
+
+/**
+ * @author 11797
+ */
+public interface SearchService {
+
+    /**
+     * 导入到es
+     * @param book 小说数据
+     */
+    void importToEs(Book book);
+
+    /**
+     * 搜索
+     * @param params 搜索参数
+     * @param page 当前页码
+     * @param pageSize 每页大小
+     * @return 分页信息
+     */
+    PageInfo searchBook(BookSP params, int page, int pageSize);
+}

novel-front/src/main/java/com/java2nb/novel/service/UserService.java

@@ -9,6 +9,7 @@ import com.java2nb.novel.vo.BookShelfVO;
 import com.java2nb.novel.entity.User;
 import com.java2nb.novel.vo.UserFeedbackVO;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -138,4 +139,40 @@ public interface UserService {
      * @param buyRecord 购买信息
      * */
     void buyBookIndex(Long userId, UserBuyRecord buyRecord);
+
+    /**
+     * 查询作品时间段内的订阅人数
+     * @param bookId 作品ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 订阅人数
+     */
+    int queryBuyMember(Long bookId, Date startTime, Date endTime);
+
+    /**
+     * 查询作品时间段内的订阅次数
+     * @param bookId 作品ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 订阅次数
+     */
+    int queryBuyCount(Long bookId, Date startTime, Date endTime);
+
+    /**
+     * 查询作品时间段内的订阅总额（屋币）
+     * @param bookId 作品ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 订阅总额（屋币）
+     */
+    int queryBuyAccount(Long bookId, Date startTime, Date endTime);
+
+    /**
+     * 查询作者时间段内的订阅人数
+     * @param bookIds z作者的所有作品ID
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 订阅人数
+     */
+    int queryBuyTotalMember(List<Long> bookIds, Date startTime, Date endTime);
 }

novel-front/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java

@@ -1,10 +1,13 @@
 package com.java2nb.novel.service.impl;
 
+import com.github.pagehelper.PageHelper;
 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.entity.Author;
+import com.java2nb.novel.entity.AuthorIncome;
+import com.java2nb.novel.entity.AuthorIncomeDetail;
 import com.java2nb.novel.entity.FriendLink;
 import com.java2nb.novel.mapper.*;
 import com.java2nb.novel.service.AuthorService;
@@ -38,6 +41,11 @@ public class AuthorServiceImpl implements AuthorService {
 
     private final AuthorCodeMapper authorCodeMapper;
 
+    private final AuthorIncomeDetailMapper authorIncomeDetailMapper;
+
+
+    private final AuthorIncomeMapper authorIncomeMapper;
+
 
     @Override
     public Boolean checkPenName(String penName) {
@@ -89,4 +97,108 @@ public class AuthorServiceImpl implements AuthorService {
                 .build()
                 .render(RenderingStrategies.MYBATIS3)).get(0);
     }
+
+    @Override
+    public List<Author> queryAuthorList(int needAuthorNumber, Date maxAuthorCreateTime) {
+        return authorMapper.selectMany(select(AuthorDynamicSqlSupport.id, AuthorDynamicSqlSupport.userId)
+                .from(AuthorDynamicSqlSupport.author)
+                .where(AuthorDynamicSqlSupport.createTime, isLessThan(maxAuthorCreateTime))
+                .orderBy(AuthorDynamicSqlSupport.createTime.descending())
+                .limit(needAuthorNumber)
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+
+    @Override
+    public boolean queryIsStatisticsDaily(Long bookId, Date date) {
+
+        return authorIncomeDetailMapper.selectMany(select(AuthorIncomeDetailDynamicSqlSupport.id)
+                .from(AuthorIncomeDetailDynamicSqlSupport.authorIncomeDetail)
+                .where(AuthorIncomeDetailDynamicSqlSupport.bookId, isEqualTo(bookId))
+                .and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isEqualTo(date))
+                .build()
+                .render(RenderingStrategies.MYBATIS3)).size() > 0;
+
+    }
+
+    @Override
+    public void saveDailyIncomeSta(AuthorIncomeDetail authorIncomeDetail) {
+        authorIncomeDetailMapper.insertSelective(authorIncomeDetail);
+    }
+
+
+    @Override
+    public boolean queryIsStatisticsMonth(Long bookId, Date incomeDate) {
+        return authorIncomeMapper.selectMany(select(AuthorIncomeDynamicSqlSupport.id)
+                .from(AuthorIncomeDynamicSqlSupport.authorIncome)
+                .where(AuthorIncomeDynamicSqlSupport.bookId, isEqualTo(bookId))
+                .and(AuthorIncomeDynamicSqlSupport.incomeMonth, isEqualTo(incomeDate))
+                .build()
+                .render(RenderingStrategies.MYBATIS3)).size() > 0;
+    }
+
+    @Override
+    public Long queryTotalAccount(Long userId, Long bookId, Date startTime, Date endTime) {
+
+        return authorIncomeDetailMapper.selectStatistic(select(sum(AuthorIncomeDetailDynamicSqlSupport.incomeAccount))
+                .from(AuthorIncomeDetailDynamicSqlSupport.authorIncomeDetail)
+                .where(AuthorIncomeDetailDynamicSqlSupport.userId, isEqualTo(userId))
+                .and(AuthorIncomeDetailDynamicSqlSupport.bookId, isEqualTo(bookId))
+                .and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isGreaterThanOrEqualTo(startTime))
+                .and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isLessThanOrEqualTo(endTime))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+
+    @Override
+    public void saveAuthorIncomeSta(AuthorIncome authorIncome) {
+        authorIncomeMapper.insertSelective(authorIncome);
+    }
+
+    @Override
+    public boolean queryIsStatisticsDaily(Long authorId, Long bookId, Date date) {
+        return authorIncomeDetailMapper.selectMany(select(AuthorIncomeDetailDynamicSqlSupport.id)
+                .from(AuthorIncomeDetailDynamicSqlSupport.authorIncomeDetail)
+                .where(AuthorIncomeDetailDynamicSqlSupport.authorId, isEqualTo(authorId))
+                .and(AuthorIncomeDetailDynamicSqlSupport.bookId, isEqualTo(bookId))
+                .and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isEqualTo(date))
+                .build()
+                .render(RenderingStrategies.MYBATIS3)).size() > 0;
+    }
+
+
+    @Override
+    public List<AuthorIncomeDetail> listIncomeDailyByPage(int page, int pageSize, Long userId, Long bookId, Date startTime, Date endTime) {
+        PageHelper.startPage(page, pageSize);
+        return authorIncomeDetailMapper.selectMany(
+                select(AuthorIncomeDetailDynamicSqlSupport.incomeDate, AuthorIncomeDetailDynamicSqlSupport.incomeAccount
+                        , AuthorIncomeDetailDynamicSqlSupport.incomeCount, AuthorIncomeDetailDynamicSqlSupport.incomeNumber)
+                        .from(AuthorIncomeDetailDynamicSqlSupport.authorIncomeDetail)
+                        .where(AuthorIncomeDetailDynamicSqlSupport.userId, isEqualTo(userId))
+                        .and(AuthorIncomeDetailDynamicSqlSupport.bookId, isEqualTo(bookId))
+                        .and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isGreaterThanOrEqualTo(startTime))
+                        .and(AuthorIncomeDetailDynamicSqlSupport.incomeDate, isLessThanOrEqualTo(endTime))
+                        .orderBy(AuthorIncomeDetailDynamicSqlSupport.incomeDate.descending())
+                        .build()
+                        .render(RenderingStrategies.MYBATIS3));
+    }
+
+
+    @Override
+    public List<AuthorIncome> listIncomeMonthByPage(int page, int pageSize, Long userId, Long bookId) {
+        PageHelper.startPage(page, pageSize);
+        return authorIncomeMapper.selectMany(select(AuthorIncomeDynamicSqlSupport.incomeMonth
+                , AuthorIncomeDynamicSqlSupport.preTaxIncome
+                , AuthorIncomeDynamicSqlSupport.afterTaxIncome
+                , AuthorIncomeDynamicSqlSupport.payStatus
+                , AuthorIncomeDynamicSqlSupport.confirmStatus)
+                .from(AuthorIncomeDynamicSqlSupport.authorIncome)
+                .where(AuthorIncomeDynamicSqlSupport.userId, isEqualTo(userId))
+                .and(AuthorIncomeDynamicSqlSupport.bookId, isEqualTo(bookId))
+                .orderBy(AuthorIncomeDynamicSqlSupport.incomeMonth.descending())
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
 }

novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java

@@ -2,28 +2,31 @@ package com.java2nb.novel.service.impl;
 
 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.config.BookPriceConfig;
 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.*;
 import com.java2nb.novel.search.BookSP;
 import com.java2nb.novel.service.AuthorService;
 import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.FileService;
+import com.java2nb.novel.service.SearchService;
 import com.java2nb.novel.vo.BookCommentVO;
 import com.java2nb.novel.vo.BookSettingVO;
 import com.java2nb.novel.vo.BookVO;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.orderbyhelper.OrderByHelper;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -40,6 +44,7 @@ import java.util.stream.Collectors;
 import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.bookCategory;
 import static com.java2nb.novel.mapper.BookCommentDynamicSqlSupport.bookComment;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.bookContent;
+import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.content;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.*;
 import static com.java2nb.novel.mapper.BookIndexDynamicSqlSupport.bookIndex;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
@@ -50,14 +55,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 +85,12 @@ public class BookServiceImpl implements BookService {
 
     private final AuthorService authorService;
 
+    private final SearchService searchService;
+
+    private final FileService fileService;
+
+    private final BookPriceConfig bookPriceConfig;
+
 
     @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,43 @@ 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 {
+                return searchService.searchBook(params,page,pageSize);
+
+            }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 +230,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 +239,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 page, Integer pageSize) {
+        if (StringUtils.isNotBlank(orderBy)) {
             OrderByHelper.orderBy(orderBy);
         }
-        if(limit != null){
-            PageHelper.startPage(1,limit);
+        if (page != null && pageSize != null) {
+            PageHelper.startPage(page, pageSize);
         }
 
-        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()
@@ -223,9 +256,10 @@ public class BookServiceImpl implements BookService {
         return bookIndexMapper.selectMany(selectStatement);
     }
 
+
     @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.bookPrice, BookIndexDynamicSqlSupport.updateTime, BookIndexDynamicSqlSupport.isVip)
                 .from(bookIndex)
                 .where(BookIndexDynamicSqlSupport.id, isEqualTo(bookIndexId))
                 .build()
@@ -271,7 +305,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 +339,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()
@@ -315,9 +349,8 @@ public class BookServiceImpl implements BookService {
     }
 
     @Override
-    public void addVisitCount(Long bookId) {
-        bookMapper.addVisitCount(bookId);
-
+    public void addVisitCount(Long bookId, Integer visitCount) {
+        bookMapper.addVisitCount(bookId,visitCount);
     }
 
     @Override
@@ -349,10 +382,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 +394,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 +407,7 @@ public class BookServiceImpl implements BookService {
         bookCommentMapper.insertSelective(comment);
         //增加书籍评论数
         bookMapper.addCommentCount(comment.getBookId());
-        
+
     }
 
     @Override
@@ -382,14 +415,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 +442,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 +462,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 +470,21 @@ public class BookServiceImpl implements BookService {
     }
 
     @Override
-    public List<Book> queryNetworkPicBooks(Integer limit, Integer offset) {
-        return bookMapper.queryNetworkPicBooks(limit,offset);
+    public List<Book> queryNetworkPicBooks(String localPicPrefix, Integer limit) {
+        return bookMapper.queryNetworkPicBooks(localPicPrefix,limit);
     }
 
     @Override
     public void updateBookPicToLocal(String picUrl, Long bookId) {
 
-        picUrl = FileUtil.network2Local(picUrl,picSavePath, Constants.LOCAL_PIC_PREFIX);
+        picUrl = fileService.transFile(picUrl, picSavePath);
 
         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,9 +493,9 @@ 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)
+        SelectStatementProvider selectStatement = select(id, bookName, picUrl, catName, visitCount, yesterdayBuy, lastIndexUpdateTime, updateTime, wordCount, lastIndexName, status)
                 .from(book)
                 .where(authorId, isEqualTo(authorService.queryAuthor(userId).getId()))
                 .orderBy(BookDynamicSqlSupport.createTime.descending())
@@ -476,10 +508,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,24 +530,24 @@ 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) {
+    public void addBookContent(Long bookId, String indexName, String content, Byte isVip, Long authorId) {
 
         Book book = queryBookDetail(bookId);
-        if(!authorId.equals(book.getAuthorId())){
+        if (!authorId.equals(book.getAuthorId())) {
             //并不是更新自己的小说
             return;
         }
         Long lastIndexId = new IdWorker().nextId();
         Date currentDate = new Date();
-        int wordCount = content.length();
+        int wordCount = StringUtil.getStrValidWordCount(content);
 
         //更新小说主表信息
         bookMapper.update(update(BookDynamicSqlSupport.book)
@@ -525,15 +558,19 @@ 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 bookPrice = new BigDecimal(wordCount).divide(bookPriceConfig.getWordCount()).multiply(bookPriceConfig.getValue()).intValue();
+
         //更新小说目录表
         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);
@@ -541,7 +578,8 @@ public class BookServiceImpl implements BookService {
         lastBookIndex.setIndexName(indexName);
         lastBookIndex.setIndexNum(indexNum);
         lastBookIndex.setBookId(bookId);
-        lastBookIndex.setIsVip(book.getStatus());
+        lastBookIndex.setIsVip(isVip);
+        lastBookIndex.setBookPrice(bookPrice);
         lastBookIndex.setCreateTime(currentDate);
         lastBookIndex.setUpdateTime(currentDate);
         bookIndexMapper.insertSelective(lastBookIndex);
@@ -553,7 +591,241 @@ 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));
+    }
+
+    @Override
+    public List<Book> queryBookList(Long authorId) {
+
+        return bookMapper.selectMany(select(id, bookName)
+                .from(book)
+                .where(BookDynamicSqlSupport.authorId,isEqualTo(authorId))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteIndex(Long indexId, Long authorId) {
+
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                int wordCount = book.getWordCount();
+                //作者ID相同，表明该小说是登录用户发布，可以删除
+                if (book.getAuthorId().equals(authorId)) {
+                    //删除目录表和内容表记录
+                    bookIndexMapper.deleteByPrimaryKey(indexId);
+                    bookContentMapper.delete(deleteFrom(bookContent).where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId)).build()
+                            .render(RenderingStrategies.MYBATIS3));
+                    //更新总字数
+                    wordCount = wordCount - bookIndex.getWordCount();
+                    //更新最新章节
+                    Long lastIndexId = null;
+                    String lastIndexName = null;
+                    Date lastIndexUpdateTime = null;
+                    List<BookIndex> lastBookIndices = bookIndexMapper.selectMany(
+                            select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.createTime)
+                                    .from(BookIndexDynamicSqlSupport.bookIndex)
+                                    .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId))
+                                    .orderBy(BookIndexDynamicSqlSupport.indexNum.descending())
+                                    .limit(1)
+                                    .build()
+                                    .render(RenderingStrategy.MYBATIS3));
+                    if (lastBookIndices.size() > 0) {
+                        BookIndex lastBookIndex = lastBookIndices.get(0);
+                        lastIndexId = lastBookIndex.getId();
+                        lastIndexName = lastBookIndex.getIndexName();
+                        lastIndexUpdateTime = lastBookIndex.getCreateTime();
+
+                    }
+                    //更新小说主表信息
+                    bookMapper.update(update(BookDynamicSqlSupport.book)
+                            .set(BookDynamicSqlSupport.wordCount)
+                            .equalTo(wordCount)
+                            .set(updateTime)
+                            .equalTo(new Date())
+                            .set(BookDynamicSqlSupport.lastIndexId)
+                            .equalTo(lastIndexId)
+                            .set(BookDynamicSqlSupport.lastIndexName)
+                            .equalTo(lastIndexName)
+                            .set(BookDynamicSqlSupport.lastIndexUpdateTime)
+                            .equalTo(lastIndexUpdateTime)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategies.MYBATIS3));
+
+
+                }
+            }
+
+
+        }
+
+
+    }
+
+    @Override
+    public void updateIndexName(Long indexId, String indexName, Long authorId) {
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                //作者ID相同，表明该小说是登录用户发布，可以修改
+                if (book.getAuthorId().equals(authorId)) {
+
+                    bookIndexMapper.update(
+                            update(BookIndexDynamicSqlSupport.bookIndex)
+                                    .set(BookIndexDynamicSqlSupport.indexName)
+                                    .equalTo(indexName)
+                                    .set(BookIndexDynamicSqlSupport.updateTime)
+                                    .equalTo(new Date())
+                                    .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId))
+                                    .build()
+                                    .render(RenderingStrategy.MYBATIS3));
+
+
+                }
+            }
+
+
+        }
+    }
+
+    @Override
+    public String queryIndexContent(Long indexId, Long authorId) {
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                //作者ID相同，表明该小说是登录用户发布
+                if (book.getAuthorId().equals(authorId)) {
+                    return bookContentMapper.selectMany(
+                            select(content)
+                                    .from(bookContent)
+                                    .where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId))
+                                    .limit(1)
+                                    .build().render(RenderingStrategy.MYBATIS3))
+                            .get(0).getContent();
+                }
+
+            }
+        }
+        return "";
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateBookContent(Long indexId, String indexName, String content, Long authorId) {
+
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                //作者ID相同，表明该小说是登录用户发布，可以修改
+                if (book.getAuthorId().equals(authorId)) {
+                    Date currentDate = new Date();
+                    int wordCount = StringUtil.getStrValidWordCount(content);
+
+                    //计算价格
+                    int bookPrice = new BigDecimal(wordCount).divide(bookPriceConfig.getWordCount()).multiply(bookPriceConfig.getValue()).intValue();
+
+
+                    //更新小说目录表
+                    int update = bookIndexMapper.update(
+                            update(BookIndexDynamicSqlSupport.bookIndex)
+                                    .set(BookIndexDynamicSqlSupport.indexName)
+                                    .equalTo(indexName)
+                                    .set(BookIndexDynamicSqlSupport.wordCount)
+                                    .equalTo(wordCount)
+                                    .set(BookIndexDynamicSqlSupport.bookPrice)
+                                    .equalTo(bookPrice)
+                                    .set(BookIndexDynamicSqlSupport.updateTime)
+                                    .equalTo(currentDate)
+                                    .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId))
+                                    .build().render(RenderingStrategy.MYBATIS3));
+
+                    //更新小说内容表
+                    bookContentMapper.update(
+                            update(BookContentDynamicSqlSupport.bookContent)
+                                    .set(BookContentDynamicSqlSupport.content)
+                                    .equalTo(content)
+                                    .where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId))
+                                    .build().render(RenderingStrategy.MYBATIS3));
+
+                }
+            }
+
+        }
     }