v2.7.0发布

README.md

@@ -1,18 +1,28 @@
-[![index]( https://i.loli.net/2020/06/01/qF1uBMtswTIPJKx.jpg )]( https://www.eve.bz/cart.php?gid=11 )
+[![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
 
 #### 新项目：小说精品屋-微服务版
 
-基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台，可用于学习和商用。
+基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
 
 Gitee仓库地址： https://gitee.com/xiongxyang/novel-cloud
 
 GitHub仓库地址： https://github.com/201206030/novel-cloud
 
-#### 演示地址
+#### 示例网站
 
-[点击前往](http://www.java2nb.com)（前台门户）
+[网站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)
 
 #### 前言
 
@@ -20,9 +30,9 @@ GitHub仓库地址： https://github.com/201206030/novel-cloud
 
 #### 项目介绍
 
-[小说精品屋](https://github.com/201206030/fiction_house)是一个多平台（web、安卓app、微信小程序）、功能完善的小说弹幕网站，包含精品小说专区、轻小说专区和漫画专区。包括小说/漫画分类、小说/漫画搜索、小说/漫画排行、完本小说/漫画、小说/漫画评分、小说/漫画在线阅读、小说/漫画书架、小说/漫画阅读记录、小说下载、小说弹幕、小说/漫画自动爬取、小说内容自动分享到微博、邮件自动推广、链接自动推送到百度搜索引擎等功能。包含电脑端、移动端、微信小程序等多个平台，现已开源web端、安卓端、小程序端源码。 
+小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
 
-小说精品屋-plus是在小说精品屋的基础上，重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
+小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
 
 - [x] 数据库重新设计，结构调整。
 - [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
@@ -116,7 +126,11 @@ novel-plus -- 父工程
 
 ![img](https://oscimg.oschina.net/oscnet/up-30766372cc7f56480ff1d7d55198204f6ea.png)
 
-![img](https://oscimg.oschina.net/oscnet/up-9737995e465b86f3bee3211221f6c3b8a56.png)
+![img](https://s1.ax1x.com/2020/11/03/BsjkOf.png)
+
+![img](https://s1.ax1x.com/2020/11/03/Bsjf1I.png)
+
+![img](https://s1.ax1x.com/2020/11/03/BsjHAg.png)
 
 10. 购买
 
@@ -144,7 +158,9 @@ novel-plus -- 父工程
 
 #### 爬虫管理系统截图
 
-![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.2/assets/crawl_index.png)
+![img](https://s1.ax1x.com/2020/11/03/BsOgbD.png)
+
+![img](https://s1.ax1x.com/2020/11/03/BsOHr8.png)
 
 #### 后台管理系统截图
 
@@ -191,16 +207,25 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 #### QQ交流群
 
-![mini-code](./assets/小说精品屋开源项目交流群群聊二维码.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)
+
+#### 联系作者
+
+精力有限有问题可以扫一扫添加作者微信（避免伸手党，只限赞赏用户，谢谢，其他不回复）
+![mini-code](https://s1.ax1x.com/2020/11/06/BWWMVJ.jpg)
 
 #### 备注
 
 精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](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 )

novel-admin/logs/debug.log

@@ -1,8 +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)
-2020-05-18 09:48:03,219 INFO (StartupInfoLogger.java:50)- Starting TestDemo on DESKTOP-CPCLUI6 with PID 13172 (started by 11797 in D:\gitee\novel-plus\novel-admin)
-2020-05-18 09:48:03,223 DEBUG (StartupInfoLogger.java:53)- Running with Spring Boot v2.0.1.RELEASE, Spring v5.0.5.RELEASE
-2020-05-18 09:48:03,227 INFO (SpringApplication.java:663)- The following profiles are active: dev

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/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-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.5.1</version>
+        <version>2.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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,19 +55,25 @@ public enum ResponseStatus {
      * */
     INVITE_CODE_INVALID(4001, "邀请码无效！"),
     AUTHOR_STATUS_FORBIDDEN(4002, "作者状态异常，暂不能管理小说！")
-    , BOOKNAME_EXISTS(4003,"已发布过同名小说！")
+    , BOOKNAME_EXISTS(4003,"已发布过同名小说！"),
 
-    ,
+    /**
+     * 小说相关错误
+     */
+    BOOK_EXISTS(5001,"该小说已存在")
+
+            ,
     /**
      * 搜索引擎相关错误
      * */
-    ES_SEARCH_FAIL(9001,"密码错误！"),
+    ES_SEARCH_FAIL(9001,"搜索引擎查询错误！"),
 
 
     /**
      * 其他通用错误
      * */
     PASSWORD_ERROR(88001,"密码错误！");
+
     private int code;
     private String msg;
 

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/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/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/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

@@ -42,12 +42,12 @@ sharding:
         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
+    #      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:
@@ -56,10 +56,10 @@ sharding:
           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}
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
             table-strategy:  #分表策略
               inline:
                 shardingColumn: index_id
@@ -74,8 +74,4 @@ pic:
   save:
     type: 2 #图片保存方式, 1不保存，使用爬取的网络图片 ，2保存在自己的存储介质
     storage: local #存储介质，local：本地，OSS：阿里云对象存储，fastDfs：分布式文件系统
-    path: /var/pic  #图片保存路径
-
-
-
-
+    path: /var/pic  #图片保存路径

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="author_income_detail"/>
 
         <!-- 指定数据库表 -->
         <!--<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.5.1</version>
+        <version>2.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -241,8 +241,6 @@ public class CrawlParser {
                         }
 
 
-                    } else {
-                        break;
                     }
 
 

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().contains(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);
+
+    }
+
     /**
      * 解析分类列表
      */
@@ -173,35 +230,7 @@ public class CrawlServiceImpl implements CrawlService {
 
 
                                 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);
-                                }
+                                parseBookAndSave(catId, ruleBean, sourceId, bookId);
                             } catch (Exception e) {
                                 log.error(e.getMessage(), e);
                             }
@@ -232,6 +261,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/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>

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.5.1</version>
+        <version>2.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 
 /**
  * @author 11797
@@ -103,7 +104,7 @@ public class AuthorController extends BaseController{
      * 发布章节内容
      * */
     @PostMapping("addBookContent")
-    public ResultBean addBookContent(Long bookId,String indexName,String content,HttpServletRequest request){
+    public ResultBean addBookContent(Long bookId,String indexName,String content,Byte isVip,HttpServletRequest request){
         //查询作家信息
         Author author = authorService.queryAuthor(getUserDetails(request).getId());
 
@@ -116,11 +117,40 @@ public class AuthorController extends BaseController{
         content = content.replaceAll("\\n","<br>")
                 .replaceAll("\\s","&nbsp;");
         //发布章节内容
-        bookService.addBookContent(bookId,indexName,content,author.getId());
+        bookService.addBookContent(bookId,indexName,content,isVip,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)
+        ));
+    }
+
 
 
 

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

@@ -140,6 +140,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 +154,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/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/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/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/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

@@ -225,9 +225,9 @@ public interface BookService {
      * @param bookId 小说ID
      * @param indexName 章节名
      * @param content 章节内容
-     * @param authorId 作者ID
-     * */
-    void addBookContent(Long bookId, String indexName, String content, Long authorId);
+     * @param isVip 是否收费
+     * @param authorId 作者ID   */
+    void addBookContent(Long bookId, String indexName, String content, Byte isVip, Long authorId);
 
 
     /**
@@ -237,4 +237,11 @@ public interface BookService {
      * @return 书籍列表
      * */
     List<Book> queryBookByUpdateTimeByPage(Date startDate, int limit);
+
+    /**
+     * 查询作品列表
+     * @param authorId 作家ID
+     * @return 作品列表
+     */
+    List<Book> queryBookList(Long authorId);
 }

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

@@ -531,13 +531,17 @@ public class BookServiceImpl implements BookService {
 
     @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())) {
             //并不是更新自己的小说
             return;
         }
+        if(book.getStatus() != 1){
+            //小说未上架，不能设置VIP
+            isVip = 0;
+        }
         Long lastIndexId = new IdWorker().nextId();
         Date currentDate = new Date();
         int wordCount = content.length();
@@ -567,7 +571,7 @@ public class BookServiceImpl implements BookService {
         lastBookIndex.setIndexName(indexName);
         lastBookIndex.setIndexNum(indexNum);
         lastBookIndex.setBookId(bookId);
-        lastBookIndex.setIsVip(book.getStatus());
+        lastBookIndex.setIsVip(isVip);
         lastBookIndex.setCreateTime(currentDate);
         lastBookIndex.setUpdateTime(currentDate);
         bookIndexMapper.insertSelective(lastBookIndex);
@@ -594,5 +598,15 @@ public class BookServiceImpl implements BookService {
                 .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));
+    }
+
 
 }

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

@@ -40,7 +40,7 @@ public class FriendLinkServiceImpl implements FriendLinkService {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
             result =  friendLinkMapper.selectMany(selectStatement);
-            cacheService.setObject(CacheKey.INDEX_LINK_KEY,result);
+            cacheService.setObject(CacheKey.INDEX_LINK_KEY,result,60 * 60 * 24);
         }
         return result;
     }

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

@@ -42,7 +42,7 @@ public class NewsServiceImpl implements NewsService {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
             result = newsMapper.selectMany(selectStatement);
-            cacheService.setObject(CacheKey.INDEX_NEWS_KEY,result);
+            cacheService.setObject(CacheKey.INDEX_NEWS_KEY,result,60 * 60 * 12);
         }
         return result;
     }

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

@@ -93,7 +93,7 @@ public class SearchServiceImpl implements SearchService {
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("wordCount").gte(params.getWordCountMin()).lte(params.getWordCountMax()));
 
         if (params.getUpdateTimeMin() != null) {
-            boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(params.getUpdateTimeMin()));
+            boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(params.getUpdateTimeMin())));
         }
 
 
@@ -134,8 +134,8 @@ public class SearchServiceImpl implements SearchService {
         log.debug(search.toString());
         SearchResult result;
         result = jestClient.execute(search);
+        log.debug(result.getJsonString());
         if (result.isSucceeded()) {
-            log.debug(result.getJsonString());
 
             Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class);
             if (resultMap.get("hits") != null) {
@@ -196,4 +196,7 @@ public class SearchServiceImpl implements SearchService {
         }
        throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL);
     }
+
+
+
 }

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

@@ -303,6 +303,51 @@ public class UserServiceImpl implements UserService {
                 .render(RenderingStrategies.MYBATIS3));
     }
 
+    @Override
+    public int queryBuyMember(Long bookId, Date startTime, Date endTime) {
+        return userMapper.selectStatistic(select(countDistinct(UserBuyRecordDynamicSqlSupport.userId))
+                .from(UserBuyRecordDynamicSqlSupport.userBuyRecord)
+                .where(UserBuyRecordDynamicSqlSupport.bookId,isEqualTo(bookId))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isGreaterThanOrEqualTo(startTime))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isLessThanOrEqualTo(endTime))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+    @Override
+    public int queryBuyCount(Long bookId, Date startTime, Date endTime) {
+        return userMapper.selectStatistic(select(count(UserBuyRecordDynamicSqlSupport.id))
+                .from(UserBuyRecordDynamicSqlSupport.userBuyRecord)
+                .where(UserBuyRecordDynamicSqlSupport.bookId,isEqualTo(bookId))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isGreaterThanOrEqualTo(startTime))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isLessThanOrEqualTo(endTime))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+    @Override
+    public int queryBuyAccount(Long bookId, Date startTime, Date endTime) {
+        return userMapper.selectStatistic(select(sum(UserBuyRecordDynamicSqlSupport.buyAmount))
+                .from(UserBuyRecordDynamicSqlSupport.userBuyRecord)
+                .where(UserBuyRecordDynamicSqlSupport.bookId,isEqualTo(bookId))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isGreaterThanOrEqualTo(startTime))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isLessThanOrEqualTo(endTime))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+    @Override
+    public int queryBuyTotalMember(List<Long> bookIds, Date startTime, Date endTime) {
+        return userMapper.selectStatistic(select(countDistinct(UserBuyRecordDynamicSqlSupport.userId))
+                .from(UserBuyRecordDynamicSqlSupport.userBuyRecord)
+                .where(UserBuyRecordDynamicSqlSupport.bookId,isIn(bookIds))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isGreaterThanOrEqualTo(startTime))
+                .and(UserBuyRecordDynamicSqlSupport.createTime,isLessThanOrEqualTo(endTime))
+                .build()
+                .render(RenderingStrategies.MYBATIS3));
+    }
+
+
 
 
 

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

@@ -49,4 +49,11 @@ xss:
   urlPatterns: /book/addBookComment,/user/addFeedBack,/author/addBook,/author/addBookContent,/author/register.html
 
 
-
+author:
+  income:
+    #税率(扣税后所得比率)
+    tax-rate: 0.9
+    #分佣比例
+    share-proportion: 0.7
+    #兑换比率(人民币)
+    exchange-proportion: 0.01

novel-front/src/main/resources/messages.properties

@@ -0,0 +1,5 @@
+#网站配置
+#网站名
+website.name=小说精品屋
+#PC站网站域名
+website.domain=www.java2nb.com

novel-front/src/main/resources/static/javascript/ajaxfileupload.js

@@ -0,0 +1,217 @@
+jQuery.extend({
+    createUploadIframe: function(id, uri)
+    {
+        //create frame
+        var frameId = 'jUploadFrame' + id;
+        var iframeHtml = '<iframe id="' + frameId + '" name="' + frameId + '" style="position:absolute; top:-9999px; left:-9999px"';
+        if(window.ActiveXObject)
+        {
+            if(typeof uri== 'boolean'){
+                iframeHtml += ' src="' + 'javascript:false' + '"';
+
+            }
+            else if(typeof uri== 'string'){
+                iframeHtml += ' src="' + uri + '"';
+
+            }
+        }
+        iframeHtml += ' />';
+        jQuery(iframeHtml).appendTo(document.body);
+
+        return jQuery('#' + frameId).get(0);
+    },
+    createUploadForm: function(id,fileElementId,data,fileElement)
+    {
+        //create form
+        var formId = 'jUploadForm' + id;
+        var fileId = 'jUploadFile' + id;
+        var form = jQuery('<form  action="" method="POST" name="' + formId + '" id="' + formId + '" enctype="multipart/form-data"></form>');
+        if(data)
+        {
+            for(var i in data)
+            {
+                jQuery('<input type="hidden" name="' + i + '" value="' + data[i] + '" />').appendTo(form);
+            }
+        }
+        var oldElement;
+        if(fileElement == null)
+            oldElement = jQuery('#' + fileElementId);
+        else
+            oldElement = fileElement;
+
+        var newElement = jQuery(oldElement).clone();
+        jQuery(oldElement).attr('id', fileId);
+        jQuery(oldElement).before(newElement);
+        jQuery(oldElement).appendTo(form);
+
+        //set attributes
+        jQuery(form).css('position', 'absolute');
+        jQuery(form).css('top', '-1200px');
+        jQuery(form).css('left', '-1200px');
+        jQuery(form).appendTo('body');
+        return form;
+    },
+
+    ajaxFileUpload: function(s) {
+        // TODO introduce global settings, allowing the client to modify them for all requests, not only timeout
+        s = jQuery.extend({}, jQuery.ajaxSettings, s);
+        var id = new Date().getTime()
+        var form = jQuery.createUploadForm(id, s.fileElementId, (typeof(s.data)=='undefined'?false:s.data),s.fileElement);
+        var io = jQuery.createUploadIframe(id, s.secureuri);
+        var frameId = 'jUploadFrame' + id;
+        var formId = 'jUploadForm' + id;
+        // Watch for a new set of requests
+        if ( s.global && ! jQuery.active++ )
+        {
+            jQuery.event.trigger( "ajaxStart" );
+        }
+        var requestDone = false;
+        // Create the request object
+        var xml = {}
+        if ( s.global )
+            jQuery.event.trigger("ajaxSend", [xml, s]);
+        // Wait for a response to come back
+        var uploadCallback = function(isTimeout)
+        {
+            var io = document.getElementById(frameId);
+            try
+            {
+                if(io.contentWindow)
+                {
+                    xml.responseText = io.contentWindow.document.body?io.contentWindow.document.body.innerHTML:null;
+                    xml.responseXML = io.contentWindow.document.XMLDocument?io.contentWindow.document.XMLDocument:io.contentWindow.document;
+
+                }else if(io.contentDocument)
+                {
+                    xml.responseText = io.contentDocument.document.body?io.contentDocument.document.body.innerHTML:null;
+                    xml.responseXML = io.contentDocument.document.XMLDocument?io.contentDocument.document.XMLDocument:io.contentDocument.document;
+                }
+            }catch(e)
+            {
+                jQuery.handleError(s, xml, null, e);
+            }
+            if ( xml || isTimeout == "timeout")
+            {
+                requestDone = true;
+                var status;
+                try {
+                    status = isTimeout != "timeout" ? "success" : "error";
+                    // Make sure that the request was successful or notmodified
+                    if ( status != "error" )
+                    {
+                        // process the data (runs the xml through httpData regardless of callback)
+                        var data = jQuery.uploadHttpData( xml, s.dataType );
+                        // If a local callback was specified, fire it and pass it the data
+                        if ( s.success )
+                            s.success( data, status );
+
+                        // Fire the global callback
+                        if( s.global )
+                            jQuery.event.trigger( "ajaxSuccess", [xml, s] );
+                    } else
+                        jQuery.handleError(s, xml, status);
+                } catch(e)
+                {
+                    status = "error";
+                    jQuery.handleError(s, xml, status, e);
+                }
+
+                // The request was completed
+                if( s.global )
+                    jQuery.event.trigger( "ajaxComplete", [xml, s] );
+
+                // Handle the global AJAX counter
+                if ( s.global && ! --jQuery.active )
+                    jQuery.event.trigger( "ajaxStop" );
+
+                // Process result
+                if ( s.complete )
+                    s.complete(xml, status);
+
+                jQuery(io).unbind()
+
+                setTimeout(function()
+                {	try
+                {
+                    jQuery(io).remove();
+                    jQuery(form).remove();
+
+                } catch(e)
+                {
+                    jQuery.handleError(s, xml, null, e);
+                }
+
+                }, 100)
+
+                xml = null
+
+            }
+        }
+        // Timeout checker
+        if ( s.timeout > 0 )
+        {
+            setTimeout(function(){
+                // Check to see if the request is still happening
+                if( !requestDone ) uploadCallback( "timeout" );
+            }, s.timeout);
+        }
+        try
+        {
+
+            var form = jQuery('#' + formId);
+            jQuery(form).attr('action', s.url);
+            jQuery(form).attr('method', 'POST');
+            jQuery(form).attr('target', frameId);
+            if(form.encoding)
+            {
+                jQuery(form).attr('encoding', 'multipart/form-data');
+            }
+            else
+            {
+                jQuery(form).attr('enctype', 'multipart/form-data');
+            }
+            jQuery(form).submit();
+
+        } catch(e)
+        {
+            jQuery.handleError(s, xml, null, e);
+        }
+
+        jQuery('#' + frameId).load(uploadCallback);
+        return {abort: function(){
+                try
+                {
+                    jQuery('#' + frameId).remove();
+                    jQuery(form).remove();
+                }
+                catch(e){}
+            }};
+    },
+
+    uploadHttpData: function( r, type ) {
+        var data = !type;
+        data = type == "xml" || data ? r.responseXML : r.responseText;
+
+        // If the type is "script", eval it in global context
+        if ( type == "script" )
+            jQuery.globalEval( data );
+        // Get the JavaScript object, if JSON is used.
+        if ( type == "json" )
+            data = jQuery.parseJSON(jQuery(data).text());
+        // evaluate scripts within html
+        if ( type == "html" )
+            jQuery("<div>").html(data).evalScripts();
+
+        return data;
+    },
+
+    handleError: function( s, xml, status, e ) {
+        // If a local callback was specified, fire it
+        if ( s.error )
+            s.error( xml, status, e );
+
+        // Fire the global callback
+        if ( s.global )
+            jQuery.event.trigger( "ajaxError", [xml, s, e] );
+    }
+});

novel-front/src/main/resources/templates/about/contact.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'联系我们_'+#{website.name}"></title>
     <meta name="keywords" content="联系我们,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
     <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/about/copyright.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'版权声明_'+#{website.name}"></title>
     <meta name="keywords" content="版权声明,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
     <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/about/default.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'关于我们_'+#{website.name}"></title>
     <meta name="keywords" content="关于我们,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
     <meta name="description" th:content="#{website.name}+'每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/about/news.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'新闻公共_'+#{website.name}"></title>
     <meta name="keywords" content="新闻公告,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学"/>
     <meta name="description"

novel-front/src/main/resources/templates/about/news_info.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'新闻公告_'+#{website.name}"></title>
     <meta name="keywords" content="新闻公告,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学"/>
     <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/about/submission.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'投稿说明_'+#{website.name}"></title>
     <meta name="keywords" content="投稿说明,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
     <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/about/user_agreement.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'用户协议_'+#{website.name}"></title>
     <meta name="keywords" content="用户协议,小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学" />
     <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/author/author_income.html

@@ -0,0 +1,227 @@
+
+<!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="/author/index.html">小说管理</a></li>
+                <li><a class="link_1 on" href="/author/author_income_detail.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 ml10"><a href="/author/author_income_detail.html">订阅明细</a></h2><i class="fl ml20 mr20 font16">|</i><h2 class="fl"><a href="/author/author_income.html" class="red">稿费汇总</a></h2>
+                </div>
+
+                <div id="divData" class="updateTable">
+                    <table cellpadding="0" cellspacing="0">
+                        <thead>
+                        <tr>
+                            <th class="goread">
+                                月份
+                            </th>
+                            <th class="goread">
+                                税前收入
+                            </th>
+                            <th class="goread">
+                                税后收入
+                            </th>
+                            <th class="goread">
+                                支付状态
+                            </th>
+                        </tr>
+
+                        </thead>
+                        <tbody id="bookList">
+
+
+
+                        </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: "/author/listIncomeMonthByPage",
+            data: {'curr':curr,'limit':limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    if (bookList.length > 0) {
+                        var bookListHtml = "";
+                        for(var i=0;i<bookList.length;i++){
+                            var book = bookList[i];
+                            bookListHtml+=(" <tr class=\"book_list\" >\n" +
+                                "                            <td class=\"goread\">\n" +
+                                "                                "+book.incomeMonth+"</td>\n" +
+                                "                            <td class=\"goread\" >"
+                                +book.preTaxIncome/100+"</td>\n" +
+                                "                            <td class=\"goread\">\n" +
+                                "                                "+book.afterTaxIncome/100+"\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"goread\">"+(book.payStatus == 1 ? '已支付' : '待支付')+
+                                "                            </td>\n" +
+
+                                " </tr>");
+                        }
+                        $("#bookList").html(bookListHtml);
+
+                        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 if (data.code == 1001) {
+                    //未登录
+                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                }else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function updateBookStatus(bookId,status) {
+
+        $.ajax({
+            type: "POST",
+            url: "/author/updateBookStatus",
+            data: {'bookId':bookId,'status':status==0?1:0},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+
+                    location.reload();
+
+
+                } else if (data.code == 1001) {
+                    //未登录
+                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                }else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+
+
+
+
+    }
+</script>
+</html>

novel-front/src/main/resources/templates/author/author_income_detail.html

@@ -0,0 +1,225 @@
+
+<!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="/author/index.html">小说管理</a></li>
+                <li><a class="link_1 on" href="/author/author_income_detail.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 ml10"><a href="/author/author_income_detail.html" class="red">订阅明细</a></h2><i class="fl ml20 mr20 font16">|</i><h2 class="fl"><a href="/author/author_income.html">稿费汇总</a></h2>
+                </div>
+
+                <div id="divData" class="updateTable">
+                    <table cellpadding="0" cellspacing="0">
+                        <thead>
+                        <tr>
+                            <th class="goread">
+                                日期
+                            </th>
+                            <th class="goread">
+                                订阅总额
+                            </th>
+                            <th class="goread">
+                                订阅次数
+                            </th>
+                            <th class="goread">
+                                订阅人数
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody id="bookList">
+
+
+
+                        </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: "/author/listIncomeDailyByPage",
+            data: {'curr':curr,'limit':limit},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    if (bookList.length > 0) {
+                        var bookListHtml = "";
+                        for(var i=0;i<bookList.length;i++){
+                            var book = bookList[i];
+                            bookListHtml+=(" <tr class=\"book_list\" >\n" +
+                                "                            <td class=\"goread\">\n" +
+                                "                                "+book.incomeDate+"</td>\n" +
+                                "                            <td class=\"goread\" >"
+                                +book.incomeAccount+"</td>\n" +
+                                "                            <td class=\"goread\">\n" +
+                                "                                "+book.incomeCount+"\n" +
+                                "                            </td>\n" +
+                                "                            <td class=\"goread\">"+book.incomeNumber+
+                                "                            </td>\n" +
+
+                                " </tr>");
+                        }
+                        $("#bookList").html(bookListHtml);
+
+                        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 if (data.code == 1001) {
+                    //未登录
+                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                }else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+
+    function updateBookStatus(bookId,status) {
+
+        $.ajax({
+            type: "POST",
+            url: "/author/updateBookStatus",
+            data: {'bookId':bookId,'status':status==0?1:0},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+
+                    location.reload();
+
+
+                } else if (data.code == 1001) {
+                    //未登录
+                    location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                }else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+
+
+
+
+    }
+</script>
+</html>

novel-front/src/main/resources/templates/author/book_add.html

@@ -8,6 +8,9 @@
         <title>作家管理系统-小说精品屋</title>
         <link rel="stylesheet" href="/css/base.css?v=1"/>
         <link rel="stylesheet" href="/css/user.css"/>
+        <style type="text/css">
+            .opacity{-khtml-opacity:0.0;-moz-opacity:0.0;filter:alpha(opacity=0);filter:"alpha(opacity=0)";opacity:0.0; filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0);/*兼容ie8及以下*/}
+        </style>
     </head>
 </head>
 <body class="">
@@ -29,8 +32,9 @@
 
             <ul class="log_list">
                 <li><a class="link_1 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_1 " href="/author/author_income_detail.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>-->
+<li><a class="link_4 " href="/user/favorites.html">单本小说爬取</a></li>-->
             </ul>
 
         </div>
@@ -74,8 +78,15 @@
                                 <input type="hidden" id="catName" name="catName" value="玄幻奇幻"/>
                                 <b>小说名：</b>
                                 <li><input type="text" id="bookName" name="bookName" class="s_input" ></li>
-                                <b>小说封面图片路径：</b>
-                                <li><input type="text" id="picUrl" name="picUrl" class="s_input" ></li>
+                                <b>小说封面：</b>
+                                <li style="position: relative">
+                                    <input class="opacity" onchange="picChange()"
+                                           type="file" id="file0" name="file"
+                                           title="点击更换图片"
+                                           style="z-index: 100;cursor: pointer;left: 0px; top: 0px; width: 100px; height: 130px; opacity: 0; position: absolute;  "
+                                    />
+                                    <img style="width:100px;height: 130px" id="picImage" src="/images/default.gif" alt="">
+                                    <input type="hidden" id="picUrl" name="picUrl" class="s_input" value="/images/default.gif"></li>
                                 <b>小说介绍：</b>
 
                                 <li><textarea name="bookDesc" rows="5" cols="53" id="bookDesc"
@@ -126,11 +137,42 @@
 
 </body>
 <script src="/javascript/jquery-1.8.0.min.js" type="text/javascript"></script>
+<script src="/javascript/ajaxfileupload.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 picChange() {
+        var file = $("#file0").val(); //文件名称
+        if (file != "") {
+
+            $.ajaxFileUpload({
+                url : "/file/upload", //用于文件上传的服务器端请求地址
+                secureuri : false, //是否需要安全协议，一般设置为false
+                fileElementId : "file0", //文件上传域的ID
+                dataType : "json", //返回值类型 一般设置为json
+                type : "post",
+                success : function(data) { //服务器成功响应处理函数
+                    if (data.code == 200) {
+                        $("#picImage").attr("src", data.data);
+                        $("#picUrl").val(data.data);
+                    }else {
+                        layer.alert('图片上传失败');
+                    }
+
+                }
+
+            });
+        } else {
+            alert("请选择上传文件！");
+        }
+
+
+
+    }
+
     var lock = false;
     function addBook() {
         if(lock){

novel-front/src/main/resources/templates/author/content_add.html

@@ -29,8 +29,9 @@
 
             <ul class="log_list">
                 <li><a class="link_1 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_1 " href="/author/author_income_detail.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>-->
+<li><a class="link_4 " href="/user/favorites.html">单本小说爬取</a></li>-->
             </ul>
 
         </div>
@@ -57,9 +58,11 @@
                                 <li><span id="LabErr"></span></li>
                                 <b>章节名：</b>
                                 <li><input type="text" id="bookIndex" name="bookIndex" class="s_input" ></li>
-                                <b>章节内容：</b>
+                                <b>章节内容：</b><li id="contentLi">
                                 <textarea name="bookContent" rows="30" cols="80" id="bookContent"
-                                          class="textarea"></textarea>
+                                          class="textarea"></textarea></li>
+
+
                                 <li style="margin-top: 10px"><input type="button" onclick="addBookContent()" name="btnRegister" value="提交"
                                            id="btnRegister" class="btn_red">
 
@@ -115,6 +118,13 @@
 
 <script language="javascript" type="text/javascript">
 
+    var bookStatus = getSearchString("bookStatus");
+    if(bookStatus == 1){
+        $("#contentLi").after("<b>是否收费：</b>\n" +
+            "                                <li><input type=\"radio\" name=\"isVip\" value=\"0\" checked  >免费\n" +
+            "                                    <input type=\"radio\" name=\"isVip\" value=\"1\"   >收费</li><br/>");
+    }
+
 
     var lock = false;
     function addBookContent() {
@@ -143,12 +153,19 @@
         }
 
 
+        var isVip = 0;
+        if(bookStatus == 1){
+
+            isVip = $("input:checked[name=isVip]").val();
+        }
+
+
 
 
         $.ajax({
             type: "POST",
             url: "/author/addBookContent",
-            data: {'bookId':bookId,'indexName':indexName,'content':content},
+            data: {'bookId':bookId,'indexName':indexName,'content':content,'isVip':isVip},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {

novel-front/src/main/resources/templates/author/index.html

@@ -28,6 +28,7 @@
 
             <ul class="log_list">
                 <li><a class="link_1 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_1 " href="/author/author_income_detail.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>
@@ -149,7 +150,7 @@
 
                                 " <td class=\"goread\" id='opt"+book.id+"'>" +
                                 "<a href='javascript:updateBookStatus(\""+book.id+"\","+book.status+")'>"+(book.status==0?'上架':'下架')+"  </a>" +
-                                "<a href='/author/content_add.html?bookId="+book.id+"'>发布章节  </a>" +
+                                "<a href='/author/content_add.html?bookStatus="+book.status+"&bookId="+book.id+"'>发布章节  </a>" +
                                 "</td>                     </tr>");
                         }
                         $("#bookList").html(bookListHtml);

novel-front/src/main/resources/templates/book/book_comment.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="${book.bookName}+'作品评论区_'+#{website.name}"></title>
     <meta name="keywords" th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节,'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'" />
     <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+#{website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+#{website.name}+'。'" />

novel-front/src/main/resources/templates/book/book_content.html

@@ -1,7 +1,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:utext="${book.bookName}+'_'+${bookIndex.indexName}+'_'+#{website.name}"></title>
     <meta name="keywords" th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节,'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'" />
     <meta name="description" th:content="${book.bookName}+','+${book.bookName}+'小说阅读,'+#{website.name}+'提供'+${book.bookName}+'首发最新章节及txt下载,'+${book.bookName}+'最新更新章节,精彩尽在'+#{website.name}+'。'" />

novel-front/src/main/resources/templates/book/book_detail.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:utext="${book.bookName}+'_'+${book.authorName}+'_'+${book.bookName}+'txt下载'+'_'+${book.bookName}+'无弹窗_'+#{website.name}"></title>
     <meta name="keywords"
           th:content="${book.bookName}+'官方首发,'+${book.bookName}+'小说,'+${book.bookName}+'最新章节'+${book.bookName}+'txt下载,'+${book.bookName}+'无弹窗,'+${book.bookName}+'吧,'+${book.bookName}+'离线完本'"/>

novel-front/src/main/resources/templates/book/book_index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:utext="${book.bookName}+'目录,'+${book.bookName}+'最新章节列表_'+#{website.name}"></title>
     <meta name="keywords" th:content="${book.bookName}+','+${book.bookName}+'目录,'+${book.bookName}+'最新章节列表'"/>
     <meta name="description"

novel-front/src/main/resources/templates/book/book_ranking.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'小说排行榜_'+#{website.name}"></title>
     <meta name="keywords" content="小说排行榜,热门小说榜,小说排行榜完结版,完结小说排行榜,完本小说排行榜,最新小说排行榜,网络小说排行榜,排行榜,点击榜,新书榜,推荐榜" />
     <meta name="description" th:content="'最新热门网络小说排行榜,包含各类热门小说榜,小说排行榜上都是受用户喜爱的小说作品,精彩尽在'+#{website.name}+'。'" />
@@ -22,7 +22,7 @@
 
                     <div class="book_tit">
                         <div class="fl">
-                            <h3 class="font26 mt5 mb5">点击榜</h3>
+                            <h3 class="font26 mt5 mb5" id="rankName">点击榜</h3>
                         </div>
                         <a class="fr"></a>
                     </div>
@@ -123,6 +123,25 @@
                 layer.alert('网络异常');
             }
         })
+        switch (rankType) {
+            case 0 : {
+                $("#rankName").html("点击榜");
+                break;
+            }
+            case 1 : {
+                $("#rankName").html("新书榜");
+                break;
+            }
+            case 2 : {
+                $("#rankName").html("更新榜");
+                break;
+            }
+            case 3 : {
+                $("#rankName").html("评论榜");
+                break;
+            }
+
+        }
 
     }
 </script>

novel-front/src/main/resources/templates/book/bookclass.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'全部作品_'+#{website.name}"></title>
     <meta name="keywords" th:content="#{website.name}+',小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学'"/>
     <meta name="description"

novel-front/src/main/resources/templates/common/header.html

@@ -1,12 +1,13 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-<head th:fragment="common_head(title,meta,links)">
+<head th:fragment="common_head(title,meta,links,script)">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
     <title th:replace="${title}">小说精品屋</title>
     <link rel="stylesheet" href="/css/base.css?v=1"/>
     <th:block th:replace="${meta}"/>
     <th:block th:replace="${links}"/>
+    <th:block th:replace="${script}"/>
     <script>
         var _hmt = _hmt || [];
         (function() {

novel-front/src/main/resources/templates/index.html

@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="#{website.name}+'_原创小说网站'"></title>
     <meta name="keywords" th:content="#{website.name}+',小说,小说网,言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,原创网络文学'"/>
     <meta name="description"
@@ -153,7 +153,6 @@
 
 </body>
 <div th:replace="common/js :: js"></div>
-<script src="/javascript/header.js" type="text/javascript"></script>
 <script language="javascript" type="text/javascript">
     $(function () {
         //加载首页书籍设置数据

novel-front/src/main/resources/templates/mobile/book/book_content.html

@@ -169,8 +169,12 @@
 
 <input type="hidden" id="bookIdHidden" th:value="${book.id}"/>
 
+<input type="hidden" id="bookNameHidden" th:value="${book.bookName}"/>
+
 <input type="hidden" id="contentIdHidden" th:value="${bookIndex.id}"/>
 
+<input type="hidden" id="indexNameHidden" th:value="${bookIndex.indexName}"/>
+
 <input type="hidden" id="indexNumHidden" th:value="${bookIndex.indexNum}"/>
 
 <script>
@@ -226,11 +230,18 @@
 <div th:replace="mobile/common/js :: js">
 </div>
 <div id="chaptercontent" class="Readarea ReadAjax_content screen_container"
-     style="color: rgb(0, 0, 0); font-size: 25px;">
+     style="color: rgb(0, 0, 0); font-size: 25px;" th:if="${!needBuy}">
     <p style="width:100%;text-alight:center; overflow: auto;-webkit-overflow-scrolling:touch;" >&nbsp;&nbsp;&nbsp;&nbsp;
         <span
                  th:utext="${bookContent.content}"></span></p>
 </div>
+<div  class="Readarea ReadAjax_content screen_container"
+     style="color: rgb(0, 0, 0); font-size: 10px;background-color: #fff" th:if="${needBuy}">
+    <h5>此章为VIP章节，需要订阅后才能继续阅读</h5>
+    价格：<span style="color: red">10屋币(1元=100屋币)</span><br/>
+    <a href="javascript:buyBookIndex()"  type="button" class="layui-btn layui-btn-sm layui-btn-radius">购买</a>
+
+</div>
 <div class="indexDiv" style="height: 42px;line-height: 42px;text-align:center;background: #f2f2f2">
 
     <a th:href="${preBookIndexId!=0?'/book/'+book.id+'/'+preBookIndexId+'.html':'#'}">上一章</a>
@@ -316,9 +327,38 @@
         }
     }
 
+    function buyBookIndex(){
+        $.ajax({
+            type: "POST",
+            url: "/user/buyBookIndex",
+            data: {'bookId':$("#bookIdHidden").val(),"bookName":$("#bookNameHidden").val(),
+                "bookIndexId":$("#contentIdHidden").val(),"bookIndexName":$("#indexNameHidden").val()},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    location.reload();
+
+
+                } else if(data.code == 1001){
+                    //未登录
+
+                }else {
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
     $.post("/book/addVisitCount", {"bookId": $("#bookIdHidden").val()}, function () {
     });
 
 </script>
 
+
+
 </html>

novel-front/src/main/resources/templates/mobile/book/book_ranking.html

@@ -159,7 +159,7 @@
 
         if(sortBy != false){
             searchData.sort = sortBy;
-        }else{
+        }else if(!keyword){
             sortBy = "last_index_update_time";
         }
 

novel-front/src/main/resources/templates/mobile/index.html

@@ -58,13 +58,13 @@
 <ul  class="layui-nav app" lay-filter="" style="display:none;padding:0 10px;text-align: center">
     <li class="layui-nav-item"><a>分类</a>
         <dl class="layui-nav-child">
-            <dd><a href="/book/book_ranking.html?catId=1">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=2">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=3">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=4">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=6">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=5">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=7">女频小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=1&sort=last_index_update_time">玄幻小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=2&sort=last_index_update_time">修真小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=3&sort=last_index_update_time">都市小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=4&sort=last_index_update_time">历史小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=6&sort=last_index_update_time">网游小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=5&sort=last_index_update_time">科幻小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=7&sort=last_index_update_time">女频小说</a></dd>
         </dl>
     </li>
     <li class="layui-nav-item"><a>全本</a>
@@ -95,13 +95,13 @@
 
 </ul>
 <ul class="layui-nav pc" lay-filter="" style="padding:0 36px;text-align: center">
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=1">玄幻小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=2">修真小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=3">都市小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=4">历史小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=6">网游小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=5">科幻小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=7">女频小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=1&sort=last_index_update_time">玄幻小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=2&sort=last_index_update_time">修真小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=3&sort=last_index_update_time">都市小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=4&sort=last_index_update_time">历史小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=6&sort=last_index_update_time">网游小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=5&sort=last_index_update_time">科幻小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=7&sort=last_index_update_time">女频小说</a></li>
     <li class="layui-nav-item"><a>完本小说</a>
         <dl class="layui-nav-child"> <!-- 二级菜单 -->
             <dd><a href="/book/book_ranking.html?bookStatus=1">全部小说</a></dd>

novel-front/src/main/resources/templates/pay/index.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'充值_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/base.css"/>
     <link rel="stylesheet" href="/css/main.css"/>

novel-front/src/main/resources/templates/user/comment.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'我的书评_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/favorites.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+    <head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
         <title th:text="'我的书架_'+#{website.name}"></title>
         <meta name="keywords" th:content="'我的书架,个人中心,'+#{website.name}+'小说,'+#{website.name}" />
         <meta name="description" th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/user/feedback.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'反馈留言_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/feedback_list.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'我的反馈_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/login.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'会员登录_'+#{website.name}"></title>
     <meta name="keywords" th:content="'会员登录,个人中心,'+#{website.name}+'小说,'+#{website.name}" />
     <meta name="description"  th:content="#{website.name}+'小说每日更新小说连载,小说排行榜,提供言情小说,都市小说,玄幻小说,穿越小说,青春小说,总裁豪门小说,网络小说,免费小说,全本小说,首发小说,最新章节免费小说阅读,精彩尽在'+#{website.name}+'小说！'" />

novel-front/src/main/resources/templates/user/read_history.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'最近阅读_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/register.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{::meta},~{::link},~{})">
     <title th:text="'会员注册_'+#{website.name}"></title>
     <meta name="keywords" th:content="'会员注册,个人中心,'+#{website.name}+'小说,'+#{website.name}"/>
     <meta name="description"

novel-front/src/main/resources/templates/user/set_name.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'修改昵称_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/set_password.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'修改密码_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/set_sex.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'修改性别_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/setup.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'账号设置_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

novel-front/src/main/resources/templates/user/userinfo.html

@@ -2,7 +2,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head th:replace="common/header :: common_head(~{::title},~{},~{::link})">
+<head th:replace="common/header :: common_head(~{::title},~{},~{::link},~{})">
     <title th:text="'个人中心_'+#{website.name}"></title>
     <link rel="stylesheet" href="/css/user.css"/>
 </head>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>2.5.1</version>
+    <version>2.7.0</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>

sql/20200615.sql

@@ -0,0 +1,40 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : localhost
+Source Server Version : 50725
+Source Host           : localhost:3306
+Source Database       : novel_plus
+
+Target Server Type    : MYSQL
+Target Server Version : 50725
+File Encoding         : 65001
+
+Date: 2020-06-15 15:06:55
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for crawl_single_task
+-- ----------------------------
+DROP TABLE IF EXISTS `crawl_single_task`;
+CREATE TABLE `crawl_single_task` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `source_id` int(11) DEFAULT NULL COMMENT '爬虫源ID',
+  `source_name` varchar(50) DEFAULT NULL COMMENT '爬虫源名',
+  `source_book_id` varchar(255) DEFAULT NULL COMMENT '源站小说ID',
+  `cat_id` int(11) DEFAULT NULL COMMENT '分类ID',
+  `book_name` varchar(50) DEFAULT NULL COMMENT '爬取的小说名',
+  `author_name` varchar(50) DEFAULT NULL COMMENT '爬取的小说作者名',
+  `task_status` tinyint(1) DEFAULT '2' COMMENT '任务状态，0：失败，1：成功，2；未执行',
+  `exc_count` tinyint(2) DEFAULT '0' COMMENT '已经执行次数，最多执行5次',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='抓取单本小说任务表';
+
+-- ----------------------------
+-- Records of crawl_single_task
+-- ----------------------------
+INSERT INTO `crawl_single_task` VALUES ('6', '2', '百书斋', '1', '1', '1', '1', '0', '5', '2020-06-15 14:36:07');
+INSERT INTO `crawl_single_task` VALUES ('7', '5', '笔趣阁', '108_108291', '1', '衍天志之不朽仙', '白衣少年丶', '1', '1', '2020-06-15 14:46:08');

sql/20201103.sql

@@ -0,0 +1,27 @@
+CREATE TABLE `author_income_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `author_id` bigint(20) NOT NULL COMMENT '作家ID',
+  `book_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '作品ID,0表示全部作品',
+  `income_date` date NOT NULL COMMENT '收入日期',
+  `income_account` int(11) NOT NULL DEFAULT '0' COMMENT '订阅总额',
+  `income_count` int(11) NOT NULL DEFAULT '0' COMMENT '订阅次数',
+  `income_number` int(11) NOT NULL DEFAULT '0' COMMENT '订阅人数',
+  `create_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='稿费收入明细统计表';
+
+CREATE TABLE `author_income` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `author_id` bigint(20) NOT NULL COMMENT '作家ID',
+  `book_id` bigint(20) NOT NULL COMMENT '作品ID',
+  `income_month` date NOT NULL COMMENT '收入月份',
+  `pre_tax_income` bigint(20) NOT NULL DEFAULT '0' COMMENT '税前收入（分）',
+  `after_tax_income` bigint(20) NOT NULL DEFAULT '0' COMMENT '税后收入（分）',
+  `pay_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '支付状态，0：待支付，1：已支付',
+  `confirm_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '稿费确认状态，0：待确认，1：已确认',
+  `detail` varchar(255) DEFAULT NULL COMMENT '详情',
+  `create_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4  COMMENT='稿费收入统计表';

sql/novel_plus.sql

@@ -1809,4 +1809,59 @@ CREATE TABLE `book_content9` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=415 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
-UPDATE `crawl_source` SET `source_name` = '书趣阁', `crawl_rule` = '{\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"7\",\n		\"catId6\": \"6\",\n		\"catId7\": \"8\"\n	},\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\n	\"bookStatusRule\": {\n		\"连载中\": 0,\n		\"完本\": 1\n	},\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\n	\"descEnd\": \"最新章节推荐地址\",\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\n	\"bookIndexStart\": \"<dt>《\",\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\n	\"contentEnd\": \"http://www.shuquge.com\"\n}', `source_status` = 1, `create_time` = '2020-05-18 12:02:34', `update_time` = '2020-05-18 12:02:34' WHERE `id` = 4;
+
+
+DROP TABLE IF EXISTS `crawl_single_task`;
+CREATE TABLE `crawl_single_task` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `source_id` int(11) DEFAULT NULL COMMENT '爬虫源ID',
+  `source_name` varchar(50) DEFAULT NULL COMMENT '爬虫源名',
+  `source_book_id` varchar(255) DEFAULT NULL COMMENT '源站小说ID',
+  `cat_id` int(11) DEFAULT NULL COMMENT '分类ID',
+  `book_name` varchar(50) DEFAULT NULL COMMENT '爬取的小说名',
+  `author_name` varchar(50) DEFAULT NULL COMMENT '爬取的小说作者名',
+  `task_status` tinyint(1) DEFAULT '2' COMMENT '任务状态，0：失败，1：成功，2；未执行',
+  `exc_count` tinyint(2) DEFAULT '0' COMMENT '已经执行次数，最多执行5次',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='抓取单本小说任务表';
+
+-- ----------------------------
+-- Records of crawl_single_task
+-- ----------------------------
+INSERT INTO `crawl_single_task` VALUES ('6', '2', '百书斋', '1', '1', '1', '1', '0', '5', '2020-06-15 14:36:07');
+INSERT INTO `crawl_single_task` VALUES ('7', '5', '笔趣阁', '108_108291', '1', '衍天志之不朽仙', '白衣少年丶', '1', '1', '2020-06-15 14:46:08');
+UPDATE `crawl_source` SET `source_name` = '书趣阁', `crawl_rule` = '{\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"7\",\n		\"catId6\": \"6\",\n		\"catId7\": \"8\"\n	},\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\n	\"bookStatusRule\": {\n		\"连载中\": 0,\n		\"完本\": 1\n	},\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\n	\"descEnd\": \"最新章节推荐地址\",\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\n	\"bookIndexStart\": \"<dt>《\",\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\n	\"contentEnd\": \"http://www.shuquge.com\"\n}', `source_status` = 1, `create_time` = '2020-05-18 12:02:34', `update_time` = '2020-05-18 12:02:34' WHERE `id` = 4;
+
+INSERT INTO `friend_link` ( `link_name`, `link_url`, `sort`, `is_open`, `create_user_id`, `create_time`, `update_user_id`, `update_time`) VALUES
+('小羊影视', 'http://video.java2nb.com/', 11, 1, NULL, NULL, NULL, NULL),
+('官方论坛', 'http://bbs.java2nb.com', 21, 1, NULL, NULL, NULL, NULL);
+
+
+CREATE TABLE `author_income_detail` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `author_id` bigint(20) NOT NULL COMMENT '作家ID',
+  `book_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '作品ID,0表示全部作品',
+  `income_date` date NOT NULL COMMENT '收入日期',
+  `income_account` int(11) NOT NULL DEFAULT '0' COMMENT '订阅总额',
+  `income_count` int(11) NOT NULL DEFAULT '0' COMMENT '订阅次数',
+  `income_number` int(11) NOT NULL DEFAULT '0' COMMENT '订阅人数',
+  `create_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='稿费收入明细统计表';
+
+CREATE TABLE `author_income` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `author_id` bigint(20) NOT NULL COMMENT '作家ID',
+  `book_id` bigint(20) NOT NULL COMMENT '作品ID',
+  `income_month` date NOT NULL COMMENT '收入月份',
+  `pre_tax_income` bigint(20) NOT NULL DEFAULT '0' COMMENT '税前收入（分）',
+  `after_tax_income` bigint(20) NOT NULL DEFAULT '0' COMMENT '税后收入（分）',
+  `pay_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '支付状态，0：待支付，1：已支付',
+  `confirm_status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '稿费确认状态，0：待确认，1：已确认',
+  `detail` varchar(255) DEFAULT NULL COMMENT '详情',
+  `create_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4  COMMENT='稿费收入统计表';