v2.8.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://s3.ax1x.com/2020/11/17/DVFiQI.png)
+
+![img](https://s1.ax1x.com/2020/11/09/B7X5oF.png)
+
+![img](https://s1.ax1x.com/2020/11/09/B7XLsx.png)
 
 10. 购买
 
@@ -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,20 @@ 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)
 
 #### 备注
 
 精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](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.8.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/Book.java

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

novel-common/src/main/java/com/java2nb/novel/entity/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/BookDynamicSqlSupport.java

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

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

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

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

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

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

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

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

@@ -8,14 +8,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Generated;
-import org.apache.ibatis.annotations.DeleteProvider;
+
-import org.apache.ibatis.annotations.InsertProvider;
+import org.apache.ibatis.annotations.*;
-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;
@@ -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:
+    #      ds1:
-#        type: com.alibaba.druid.pool.DruidDataSource
+    #        type: com.alibaba.druid.pool.DruidDataSource
-#        driver-class-name: com.mysql.jdbc.Driver
+    #        driver-class-name: com.mysql.jdbc.Driver
-#        url: jdbc:mysql://localhost:3306/novel_plus2
+    #        url: jdbc:mysql://localhost:3306/novel_plus2
-#        username: root
+    #        username: root
-#        password: test123456
+    #        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:  #分库策略
+            #            database-strategy:  #分库策略
-#              inline:
+            #              inline:
-#                sharding-column: book_id
+            #                sharding-column: book_id
-#                algorithm-expression: ds${book_id % 10}
+            #                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="book"/>
 
         <!-- 指定数据库表 -->
         <!--<table schema="jly" tableName="job_position" domainObjectName="JobPositionTest"/>-->

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.5.1</version>
+        <version>2.8.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.*;
-import com.java2nb.novel.entity.BookContent;
-import com.java2nb.novel.entity.BookIndex;
-import com.java2nb.novel.entity.CrawlSource;
 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.*;
-import com.java2nb.novel.entity.BookContent;
-import com.java2nb.novel.entity.BookIndex;
 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.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.update;
 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);
+                                parseBookAndSave(catId, ruleBean, sourceId, 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);
-                                }
                             } 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.8.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

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

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

@@ -167,7 +167,15 @@ public class BookController extends BaseController{
      * */
     @PostMapping("queryNewIndexList")
     public ResultBean queryNewIndexList(Long bookId){
-       return ResultBean.ok(bookService.queryIndexList(bookId,"index_num desc",10));
+        return ResultBean.ok(bookService.queryIndexList(bookId,"index_num desc",1,10));
+    }
+
+    /**
+     * 目录页
+     * */
+    @PostMapping("/queryIndexList")
+    public ResultBean indexList(Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,@RequestParam(value = "orderBy") String orderBy) {
+        return ResultBean.ok(new PageInfo<>(bookService.queryIndexList(bookId,orderBy,page,pageSize)));
     }
 
 

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

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

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

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

@@ -66,10 +66,12 @@ public interface BookService {
      * 查询目录列表
      * @param bookId 书籍ID
      * @param orderBy 排序
-     *@param limit 查询条数
+     * @param page 查询页码
+     *@param pageSize 分页大小
      *@return 目录集合
      * */
-    List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer limit);
+    List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer page, Integer pageSize);
+
 
     /**
      * 查询目录
@@ -225,9 +227,9 @@ public interface BookService {
      * @param bookId 小说ID
      * @param indexName 章节名
      * @param content 章节内容
-     * @param authorId 作者ID
+     * @param isVip 是否收费
-     * */
+     * @param authorId 作者ID   */
-    void addBookContent(Long bookId, String indexName, String content, Long authorId);
+    void addBookContent(Long bookId, String indexName, String content, Byte isVip, Long authorId);
 
 
     /**
@@ -237,4 +239,43 @@ public interface BookService {
      * @return 书籍列表
      * */
     List<Book> queryBookByUpdateTimeByPage(Date startDate, int limit);
+
+    /**
+     * 查询作品列表
+     * @param authorId 作家ID
+     * @return 作品列表
+     */
+    List<Book> queryBookList(Long authorId);
+
+    /**
+     * 删除章节
+     * @param indexId
+     * @param authorId 作家ID
+     */
+    void deleteIndex(Long indexId, Long authorId);
+
+    /**
+     * 更新章节名
+     * @param indexId
+     * @param indexName
+     * @param authorId
+     */
+    void updateIndexName(Long indexId, String indexName, Long authorId);
+
+    /**
+     * 查询章节内容
+     * @param indexId
+     * @param authorId
+     * @return
+     */
+    String queryIndexContent(Long indexId, Long authorId);
+
+    /**
+     *  更新章节内容
+     * @param indexId
+     * @param indexName
+     * @param content
+     * @param authorId
+     */
+    void updateBookContent( Long indexId, String indexName, String content, Long authorId);
 }

novel-front/src/main/java/com/java2nb/novel/service/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

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,6 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.orderbyhelper.OrderByHelper;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -41,6 +43,7 @@ import java.util.stream.Collectors;
 import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.bookCategory;
 import static com.java2nb.novel.mapper.BookCommentDynamicSqlSupport.bookComment;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.bookContent;
+import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.content;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.*;
 import static com.java2nb.novel.mapper.BookIndexDynamicSqlSupport.bookIndex;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
@@ -233,12 +236,12 @@ public class BookServiceImpl implements BookService {
     }
 
     @Override
-    public List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer limit) {
+    public List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer page, Integer pageSize) {
         if (StringUtils.isNotBlank(orderBy)) {
             OrderByHelper.orderBy(orderBy);
         }
-        if (limit != null) {
+        if (page != null && pageSize != null) {
-            PageHelper.startPage(1, limit);
+            PageHelper.startPage(page, pageSize);
         }
 
         SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.updateTime, BookIndexDynamicSqlSupport.isVip)
@@ -250,6 +253,7 @@ public class BookServiceImpl implements BookService {
         return bookIndexMapper.selectMany(selectStatement);
     }
 
+
     @Override
     public BookIndex queryBookIndex(Long bookIndexId) {
         SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.wordCount, BookIndexDynamicSqlSupport.updateTime, BookIndexDynamicSqlSupport.isVip)
@@ -488,7 +492,7 @@ public class BookServiceImpl implements BookService {
 
         PageHelper.startPage(page, pageSize);
 
-        SelectStatementProvider selectStatement = select(id, bookName, visitCount, lastIndexName, status)
+        SelectStatementProvider selectStatement = select(id, bookName, picUrl, catName, visitCount, yesterdayBuy, lastIndexUpdateTime, updateTime, wordCount, lastIndexName, status)
                 .from(book)
                 .where(authorId, isEqualTo(authorService.queryAuthor(userId).getId()))
                 .orderBy(BookDynamicSqlSupport.createTime.descending())
@@ -531,7 +535,7 @@ 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())) {
@@ -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,221 @@ 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));
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteIndex(Long indexId, Long authorId) {
+
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                int wordCount = book.getWordCount();
+                //作者ID相同，表明该小说是登录用户发布，可以删除
+                if (book.getAuthorId().equals(authorId)) {
+                    //删除目录表和内容表记录
+                    bookIndexMapper.deleteByPrimaryKey(indexId);
+                    bookContentMapper.delete(deleteFrom(bookContent).where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId)).build()
+                            .render(RenderingStrategies.MYBATIS3));
+                    //更新总字数
+                    wordCount = wordCount - bookIndex.getWordCount();
+                    //更新最新章节
+                    Long lastIndexId = null;
+                    String lastIndexName = null;
+                    Date lastIndexUpdateTime = null;
+                    List<BookIndex> lastBookIndices = bookIndexMapper.selectMany(
+                            select(BookIndexDynamicSqlSupport.id, BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.createTime)
+                                    .from(BookIndexDynamicSqlSupport.bookIndex)
+                                    .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId))
+                                    .orderBy(BookIndexDynamicSqlSupport.indexNum.descending())
+                                    .limit(1)
+                                    .build()
+                                    .render(RenderingStrategy.MYBATIS3));
+                    if (lastBookIndices.size() > 0) {
+                        BookIndex lastBookIndex = lastBookIndices.get(0);
+                        lastIndexId = lastBookIndex.getId();
+                        lastIndexName = lastBookIndex.getIndexName();
+                        lastIndexUpdateTime = lastBookIndex.getCreateTime();
+
+                    }
+                    //更新小说主表信息
+                    bookMapper.update(update(BookDynamicSqlSupport.book)
+                            .set(BookDynamicSqlSupport.wordCount)
+                            .equalTo(wordCount)
+                            .set(updateTime)
+                            .equalTo(new Date())
+                            .set(BookDynamicSqlSupport.lastIndexId)
+                            .equalTo(lastIndexId)
+                            .set(BookDynamicSqlSupport.lastIndexName)
+                            .equalTo(lastIndexName)
+                            .set(BookDynamicSqlSupport.lastIndexUpdateTime)
+                            .equalTo(lastIndexUpdateTime)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategies.MYBATIS3));
+
+
+                }
+            }
+
+
+        }
+
+
+    }
+
+    @Override
+    public void updateIndexName(Long indexId, String indexName, Long authorId) {
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                //作者ID相同，表明该小说是登录用户发布，可以修改
+                if (book.getAuthorId().equals(authorId)) {
+
+                    bookIndexMapper.update(
+                            update(BookIndexDynamicSqlSupport.bookIndex)
+                                    .set(BookIndexDynamicSqlSupport.indexName)
+                                    .equalTo(indexName)
+                                    .set(BookIndexDynamicSqlSupport.updateTime)
+                                    .equalTo(new Date())
+                                    .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId))
+                                    .build()
+                                    .render(RenderingStrategy.MYBATIS3));
+
+
+                }
+            }
+
+
+        }
+    }
+
+    @Override
+    public String queryIndexContent(Long indexId, Long authorId) {
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                //作者ID相同，表明该小说是登录用户发布
+                if (book.getAuthorId().equals(authorId)) {
+                    return bookContentMapper.selectMany(
+                            select(content)
+                                    .from(bookContent)
+                                    .where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId))
+                                    .limit(1)
+                                    .build().render(RenderingStrategy.MYBATIS3))
+                            .get(0).getContent();
+                }
+
+            }
+        }
+        return "";
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateBookContent(Long indexId, String indexName, String content, Long authorId) {
+
+        //查询小说章节表信息
+        List<BookIndex> bookIndices = bookIndexMapper.selectMany(
+                select(BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.wordCount)
+                        .from(bookIndex)
+                        .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId)).build().render(RenderingStrategy.MYBATIS3));
+        if (bookIndices.size() > 0) {
+            BookIndex bookIndex = bookIndices.get(0);
+            //获取小说ID
+            Long bookId = bookIndex.getBookId();
+            //查询小说表信息
+            List<Book> books = bookMapper.selectMany(
+                    select(wordCount, BookDynamicSqlSupport.authorId)
+                            .from(book)
+                            .where(id, isEqualTo(bookId))
+                            .build()
+                            .render(RenderingStrategy.MYBATIS3));
+            if (books.size() > 0) {
+                Book book = books.get(0);
+                //作者ID相同，表明该小说是登录用户发布，可以修改
+                if (book.getAuthorId().equals(authorId)) {
+                    Date currentDate = new Date();
+                    int wordCount = content.length();
+
+                    //更新小说目录表
+                    int update = bookIndexMapper.update(
+                            update(BookIndexDynamicSqlSupport.bookIndex)
+                                    .set(BookIndexDynamicSqlSupport.indexName)
+                                    .equalTo(indexName)
+                                    .set(BookIndexDynamicSqlSupport.wordCount)
+                                    .equalTo(wordCount)
+                                    .set(BookIndexDynamicSqlSupport.updateTime)
+                                    .equalTo(currentDate)
+                                    .where(BookIndexDynamicSqlSupport.id, isEqualTo(indexId))
+                                    .build().render(RenderingStrategy.MYBATIS3));
+
+                    //更新小说内容表
+                    bookContentMapper.update(
+                            update(BookContentDynamicSqlSupport.bookContent)
+                                    .set(BookContentDynamicSqlSupport.content)
+                                    .equalTo(content)
+                                    .where(BookContentDynamicSqlSupport.indexId, isEqualTo(indexId))
+                                    .build().render(RenderingStrategy.MYBATIS3));
+
+                }
+            }
+
+        }
+    }
+
 
 }

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/static/javascript/bookdetail.js

@@ -238,17 +238,17 @@
                     if (preId > 0) {
                         location.href = '/book/' + bid + '/' + preId + '.html';
                     } else {
-                        location.href = '/book/chapterlist-' + bid + '.html';
+                        location.href = '/book/indexList-' + bid + '.html';
                     }
                 } else if (e.keyCode == 39) {
                     if (nextId > 0) {
                         location.href = '/book/' + bid + '/' + nextId + '.html';
                     } else {
-                        location.href = '/book/chapterlist-' + bid + '.html';
+                        location.href = '/book/indexList-' + bid + '.html';
                     }
                 }
             });
-        BookDetail.SetReadHistory(bid, cid, crank);
+        //BookDetail.SetReadHistory(bid, cid, crank);
     },
     SetReadHistory: function (bid, cid, crank) {
         var strHistory = jQuery.cookie("wapviewhistory");

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

@@ -0,0 +1,16 @@
+//格式化时间函数
+Date.prototype.Format = function (fmt) {
+    var o = {
+        "M+": this.getMonth() + 1, //月份
+        "d+": this.getDate(), //日
+        "h+": this.getHours(), //小时
+        "m+": this.getMinutes(), //分
+        "s+": this.getSeconds(), //秒
+        "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+        "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+        if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+};

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_4" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_2 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,233 @@
+
+<!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_4" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_2 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 src="/javascript/common.js" type="text/javascript"></script>
+
+<script language="javascript" type="text/javascript">
+    var bookId = getSearchString("bookId");
+    search(1, 10);
+
+    function search(curr, limit) {
+
+        var data = {'curr':curr,'limit':limit};
+
+        if(bookId){
+            data.bookId = bookId;
+        }
+
+        $.ajax({
+            type: "POST",
+            url: "/author/listIncomeDailyByPage",
+            data: data,
+            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="">
@@ -28,9 +31,10 @@
         <div class="my_l">
 
             <ul class="log_list">
-                <li><a class="link_1 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_4 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_2 " 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>
+                                <b>小说封面：</b>
-                                <li><input type="text" id="picUrl" name="picUrl" class="s_input" ></li>
+                                <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/pic_upload.png" 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

@@ -28,9 +28,10 @@
         <div class="my_l">
 
             <ul class="log_list">
-                <li><a class="link_1 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_4 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_2 " 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,15 @@
                                 <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><br/>
+
+                                <b>是否收费：</b>
+                                <li><input type="radio" name="isVip" value="0" checked  >免费
+                                 <input type="radio" name="isVip" value="1"   >收费</li>
+
+
                                 <li style="margin-top: 10px"><input type="button" onclick="addBookContent()" name="btnRegister" value="提交"
                                            id="btnRegister" class="btn_red">
 
@@ -143,17 +150,20 @@
         }
 
 
+        var 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) {
 
-                    window.location.href = '/author/index.html';
+                    window.location.href = '/author/index_list.html?bookId='+bookId;
 
 
                 } else {

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

@@ -0,0 +1,220 @@
+<!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_4 on" href="/author/index.html">作品管理</a></li>
+                <li><a class="link_2 " href="/author/author_income_detail.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="aspNetHidden">
+                            <input type="hidden" name="__VIEWSTATE" id="__VIEWSTATE"
+                                   value="/wEPDwUKLTIzNjMxNDQxNw9kFgJmD2QWAmYPFgIeBFRleHQFqAE8YSBocmVmPSIvc2VhcmNoLmFzcHg/c2VhcmNoS2V5PeWWu+Wuiembr++8jOeLhOazve+8jOeBteW8gu+8jOWJjeS4luS7iueUn++8jOWGpeeOi+msvOWkqyIgdGFyZ2V0PSJfYmxhbmsiPuWWu+Wuiembr++8jOeLhOazve+8jOeBteW8gu+8jOWJjeS4luS7iueUn++8jOWGpeeOi+msvOWkqzwvYT5kZOquoASBvnvPbc/TYIQiLhSPJ8GKnYQrmk7jGhb5AC5Q">
+                        </div>
+
+                        <div class="aspNetHidden">
+
+                            <input type="hidden" name="__VIEWSTATEGENERATOR" id="__VIEWSTATEGENERATOR" value="23AA6834">
+                            <input type="hidden" name="__EVENTVALIDATION" id="__EVENTVALIDATION"
+                                   value="/wEdAAVece19BIZ9HiByRfHz3pfnqKSXUE1UN51mNFrIuw38c3Y2+Mc6SrnAqio3oCKbxYZZ1lS+gZUZKpbsAea8j7ASAv40DHFcQ/NE7tJUnABeyQ3d9sFDIcFCYNqlVtprfLoh4JFy0U+R/CcMuyAiWTz7">
+                        </div>
+                        <div class="user_l">
+                            <div></div>
+                            <h3>小说章节内容填写</h3>
+                            <ul class="log_list">
+                                <li><span id="LabErr"></span></li>
+                                <b>章节名：</b>
+                                <li><input type="text" id="bookIndex" name="bookIndex" class="s_input" ></li>
+                                <b>章节内容：</b>
+                                <li id="contentLi">
+                                <textarea  name="bookContent" rows="30" cols="80" id="bookContent"
+                                          class="textarea"></textarea>
+                                </li>
+                                <li style="margin-top: 10px"><input type="button" onclick="addBookContent()" name="btnRegister" value="提交"
+                                           id="btnRegister" class="btn_red">
+
+
+                                </li>
+                            </ul>
+                        </div>
+                    </form>
+                </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 src="/javascript/common.js" type="text/javascript"></script>
+
+<script language="javascript" type="text/javascript">
+
+    var bookId = getSearchString("bookId");
+    var indexId = getSearchString("indexId");
+    var indexName = decodeURI(decodeURI(getSearchString("indexName")));
+    var isVip = getSearchString("isVip");
+
+    $("#bookIndex").val(indexName);
+    if(isVip == 1){
+        $("#contentLi").after("<b>是否收费：</b>\n" +
+            "                                <li><input type=\"radio\" disabled name=\"isVip\" value=\"0\"   >免费\n" +
+            "                                    <input type=\"radio\" disabled name=\"isVip\" value=\"1\"  checked >收费</li><br/>");
+    }else{
+        $("#contentLi").after("<b>是否收费：</b>\n" +
+            "                                <li><input type=\"radio\" disabled name=\"isVip\" value=\"0\"  checked >免费\n" +
+            "                                    <input type=\"radio\" disabled name=\"isVip\" value=\"1\"   >收费</li><br/>");
+
+    }
+
+    $.ajax({
+        type: "POST",
+        url: "/author/queryIndexContent",
+        data: {'indexId':indexId},
+        dataType: "json",
+        success: function (data) {
+            if (data.code == 200) {
+
+                $("#bookContent").html(data.data);
+
+
+
+            } else {
+                layer.alert(data.msg);
+            }
+
+        },
+        error: function () {
+            lock = false;
+            layer.alert('网络异常');
+        }
+    })
+
+
+
+
+
+
+    var lock = false;
+    function addBookContent() {
+
+        if(lock){
+            return;
+        }
+        lock = true;
+
+
+
+
+
+        var indexName = $("#bookIndex").val();
+        if(!indexName){
+            $("#LabErr").html("章节名不能为空！");
+            lock = false;
+            return;
+        }
+
+        var content = $("#bookContent").val();
+        if(!content){
+            $("#LabErr").html("章节内容不能为空！");
+            lock = false;
+            return;
+        }
+
+
+
+
+
+        $.ajax({
+            type: "POST",
+            url: "/author/updateBookContent",
+            data: {'indexId':indexId,'indexName':indexName,'content':content},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+
+                    window.location.href = '/author/index_list.html?bookId='+bookId;
+
+
+                } else {
+                    lock = false;
+                    $("#LabErr").html(data.msg);
+                }
+
+            },
+            error: function () {
+                lock = false;
+                layer.alert('网络异常');
+            }
+        })
+
+    }
+
+</script>
+</html>

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

@@ -8,6 +8,19 @@
         <title>作家管理系统-小说精品屋</title>
         <link rel="stylesheet" href="/css/base.css?v=1"/>
         <link rel="stylesheet" href="/css/user.css" />
+        <style type="text/css">
+            .redBtn{
+                padding: 5px;
+                border-radius: 20px;
+                border: 1px solid #f80;
+                background: #f80;
+                color: #fff;
+            }
+            a.redBtn:hover{
+
+                color: #fff;
+            }
+        </style>
     </head>
 </head>
 <body class="">
@@ -27,14 +40,19 @@
         <div class="my_l">
 
             <ul class="log_list">
-                <li><a class="link_1 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_4 on" href="/author/index.html">小说管理</a></li>
+                <li><a class="link_2 " 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 id="noContentDiv"  >
+                <div class="tc" style="margin-top: 200px"><a href="/author/book_add.html" class="btn_red">创建作品</a></div>
+
+            </div>
+            <div class="my_bookshelf" id="hasContentDiv" style="display: none">
                 <div class="title cf">
                     <h2 class="fl">小说列表</h2>
                     <div class="fr"><a href="/author/book_add.html" class="btn_red">发布小说</a></div>
@@ -44,20 +62,23 @@
                     <table cellpadding="0" cellspacing="0">
                         <thead>
                         <tr>
-                            <th class="style">
+                            <th class="goread">
-                                序号
+                                书名
                             </th>
-                            <th class="name">
+                            <th class="goread">
-                                小说名
+                                分类
                             </th>
                             <th class="goread">
                                 点击量
                             </th>
-                            <th class="name">
+                            <th class="goread">
-                                最新章节
+                                昨日订阅数
                             </th>
                             <th class="goread">
-                                状态
+                                更新时间
+                            </th>
+                            <th class="goread">
+                                总字数
                             </th>
                             <th class="goread">
                                 操作
@@ -115,9 +136,10 @@
 <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 src="/javascript/date.js" type="text/javascript"></script>
 
 <script language="javascript" type="text/javascript">
-    search(1, 10);
+    search(1, 5);
 
     function search(curr, limit) {
 
@@ -130,26 +152,41 @@
                 if (data.code == 200) {
                     var bookList = data.data.list;
                     if (bookList.length > 0) {
+                        $("#hasContentDiv").css("display","block");
+                        $("#noContentDiv").css("display","none");
                         var bookListHtml = "";
                         for(var i=0;i<bookList.length;i++){
                             var book = bookList[i];
                             bookListHtml+=(" <tr class=\"book_list\" vals=\"291\">\n" +
-                                "                            <td class=\"style bookclass\">\n" +
+                                /* "                            <td class=\"style bookclass\">\n" +
-                                "                                ["+(i+1)+"]\n" +
+                                 "                                ["+(i+1)+"]\n" +
-                                "                            </td>\n" +
+                                 "                            </td>\n" +*/
-                                "                            <td class=\"name\">\n" +
+
+                                "                            <td class=\"goread\">\n" +
+                                "<img width='50' height='70' src='"+book.picUrl+"'/><br/>" +
                                 "                                "+book.bookName+"</td>\n" +
+
+
+                                "                            <td class=\"goread\" >"
+                                +book.catName+"</td>\n" +
+
                                 "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
                                 +book.visitCount+"</td>\n" +
-                                "                            <td class=\"name\">\n" +
+
-                                "                                "+book.lastIndexName+"\n" +
+                                "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
-                                "                            </td>\n" +
+                                +book.yesterdayBuy+"</td>\n" +
-                                "                            <td class=\"goread\" id='bookStatus"+book.id+"'>"+(book.status==0?'免费':'上架')+
+
+                                "                            <td class=\"goread\">\n" +
+                                "                                "+new Date(Date.parse(book.lastIndexUpdateTime?book.lastIndexUpdateTime:book.updateTime)).Format("yyyy-MM-dd hh:mm")+"更新\n" +
                                 "                            </td>\n" +
 
+                                "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
+                                +book.wordCount+"</td>\n" +
+
                                 " <td class=\"goread\" id='opt"+book.id+"'>" +
-                                "<a href='javascript:updateBookStatus(\""+book.id+"\","+book.status+")'>"+(book.status==0?'上架':'下架')+"  </a>" +
+                                "<a target='_blank' class='redBtn' href='/author/index_list.html?bookId="+book.id+"'>章节管理  </a><br/>" +
-                                "<a href='/author/content_add.html?bookId="+book.id+"'>发布章节  </a>" +
+                                "<a target='_blank' href='/author/author_income_detail.html?bookId="+book.id+"'>薪酬查询  </a><br/>"+
+                                "<a target='_blank' href='/book/"+book.id+".html'>作品信息</a>"+
                                 "</td>                     </tr>");
                         }
                         $("#bookList").html(bookListHtml);

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

@@ -0,0 +1,330 @@
+<!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"/>
+        <style type="text/css">
+            .redBtn {
+                padding: 5px;
+                border-radius: 20px;
+                border: 1px solid #f80;
+                background: #f80;
+                color: #fff;
+            }
+
+            a.redBtn:hover {
+
+                color: #fff;
+            }
+        </style>
+    </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_4 on" href="/author/index.html">作品管理</a></li>
+                <li><a class="link_2 " href="/author/author_income_detail.html">稿费收入</a></li>
+            </ul>
+
+        </div>
+        <div class="my_r">
+            <div id="noContentDiv">
+                <div class="tc" style="margin-top: 200px"><a href="javascript:addContent()" class="btn_red">新建章节</a>
+                </div>
+
+            </div>
+            <div class="my_bookshelf" id="hasContentDiv" style="display: none">
+                <div class="title cf">
+                    <h2 class="fl">章节列表</h2>
+                    <div class="fr"><a href="javascript:addContent()" 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="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 src="/javascript/date.js" type="text/javascript"></script>
+<script src="/javascript/common.js" type="text/javascript"></script>
+
+<script language="javascript" type="text/javascript">
+
+    var bookId = getSearchString("bookId");
+
+    var indexCount = 0;
+
+    search(1, 5);
+
+    function search(curr, limit) {
+
+        $.ajax({
+            type: "POST",
+            url: "/book/queryIndexList",
+            data: {'bookId': bookId, 'curr': curr, 'limit': limit, 'orderBy': 'index_num desc'},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    var bookList = data.data.list;
+                    if (bookList.length > 0) {
+                        indexCount = bookList.length;
+                        $("#hasContentDiv").css("display", "block");
+                        $("#noContentDiv").css("display", "none");
+                        var bookListHtml = "";
+                        for (var i = 0; i < bookList.length; i++) {
+                            var book = bookList[i];
+                            bookListHtml += (" <tr class=\"book_list\" vals=\"291\">\n" +
+                                /*  "                            <td class=\"style bookclass\">\n" +
+                                  "                                ["+(i+1)+"]\n" +
+                                  "                            </td>\n" +*/
+
+                                "                            <td id='name" + book.id + "' class=\"name\">\n" +
+                                "                                " + book.indexName + "</td>\n" +
+
+
+                                "                            <td class=\"goread\">\n" +
+                                "                                " + new Date(Date.parse(book.updateTime)).Format("yyyy-MM-dd hh:mm") + "<br/>更新\n" +
+                                "                            </td>\n" +
+
+                                "                            <td class=\"goread\" valsc=\"291|2037554|1\">"
+                                + (book.isVip == 1 ? '收费' : '免费') + "</td>\n" +
+
+                                " <td class=\"goread\" id='opt" + book.id + "'>" +
+                                "<a  class='redBtn' href='javascript:updateIndex(\"" + book.id + "\"," + book.isVip + ")'>修改  </a><br/>" +
+                                "<a  href='javascript:deleteIndex(\"" + book.id + "\")'>删除  </a><br/>" +
+                                "</td>                     </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 addContent() {
+        location.href = "/author/content_add.html?indexCount=" + indexCount + "&bookId=" + bookId;
+
+    }
+
+    function updateIndex(indexId, isVip) {
+
+        var indexName = $.trim($("#name" + indexId).text());
+
+
+        location.href = "/author/content_update.html?bookId=" + bookId
+            + "&indexId=" + indexId
+            + "&indexName=" + encodeURI(encodeURI(indexName))
+            + "&isVip=" + isVip;
+
+
+        /*
+                var indexName = $("#name"+indexId).text();
+
+                var htmlStr = "<input type=\"text\" value=\""+$.trim(indexName)+"\">";
+
+                $("#name"+indexId).html(htmlStr);
+                $("#name"+indexId).find("input").focus();
+                $("#name"+indexId).find("input").select();
+
+                $("#name"+indexId).find("input").keyup(function(event){
+                    if(event.keyCode ==13){
+                        $(this).blur();
+                    }
+                });
+
+                $("#name"+indexId).find("input").blur(function () {
+                    var indexName = $(this).val();
+                    $.ajax({
+                        type: "POST",
+                        url: "/author/updateIndexName",
+                        data: {'indexId':indexId,'indexName':indexName},
+                        dataType: "json",
+                        success: function (data) {
+                            if (data.code == 200) {
+
+                                $("#name"+indexId).html(indexName);
+
+
+                            } else if (data.code == 1001) {
+                                //未登录
+                                location.href = '/user/login.html?originUrl=' + decodeURIComponent(location.href);
+
+                            }else {
+                                layer.alert(data.msg);
+                            }
+
+                        },
+                        error: function () {
+                            layer.alert('网络异常');
+                        }
+                    })
+
+                });*/
+
+
+    }
+
+
+    function deleteIndex(indexId) {
+
+        layer.confirm('确认要删除吗？删除后数据无法找回！', {
+            btn: ['确定', '取消']//按钮
+        }, function (index) {
+
+            layer.close(index);
+            $.ajax({
+                type: "POST",
+                url: "/author/deleteIndex",
+                data: {'indexId': indexId},
+                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/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}+'。'" />
@@ -40,6 +40,8 @@
 <input type="hidden" id="preIndexName" th:value="${bookIndex.indexName}"/>
 
 <input type="hidden" id="preContentId" th:value="${bookIndex.id}"/>
+<input type="hidden" id="preIndexId" th:value="${preBookIndexId}"/>
+<input type="hidden" id="nextIndexId" th:value="${nextBookIndexId}"/>
 
 <div th:replace="common/top :: top('10')">
 </div>
@@ -269,11 +271,12 @@
     })
 
 
-    var currentBId =37, usfltotal = 0, spmymoney = 0;
+    var bookId = $("#bookId").val();
+    var indexId = $("#preContentId").val();
+    var preIndexId = $("#preIndexId").val();
+    var nextIndexId = $("#nextIndexId").val();
     $(function () {
-        BookDetail.GetReadSet(37,1959973,0,1959974,1);
+        BookDetail.GetReadSet(bookId,indexId,preIndexId,nextIndexId,1);
-        BookDetail.ClickChapter(37,1959973,0);
-        BookDetail.GetFavorites(37);
         $(".ico_setup").click(function () {
 
             $(".maskBox,.setupBox").show();
@@ -318,7 +321,7 @@
         if(bookIndexId != 0){
             window.location.href = '/book/'+bookId+'/'+bookIndexId+".html";
         }else{
-            layer.alert("已经是第一章了！");
+            window.location.href = '/book/indexList-' + bookId + '.html';
         }
 
     }
@@ -326,7 +329,7 @@
         if(bookIndexId != 0){
             window.location.href = '/book/'+bookId+'/'+bookIndexId+".html";
         }else{
-            layer.alert("已经是最新章节了！");
+            window.location.href = '/book/indexList-' + bookId + '.html';
         }
 
     }

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}+'离线完本'"/>
@@ -45,7 +45,7 @@
                     <a class="icon_hide" href="javascript:void(0)" onclick=""><i></i>收起</a>
                     <a class="icon_show" href="javascript:void(0)" onclick=""><i></i>展开</a>
                 </div>
-                <div class="btns">
+                <div class="btns" id="optBtn">
                     <a th:href="'/book/'+${book.id}+'/'+${firstBookIndexId}+'.html'" class="btn_ora">点击阅读</a>
                     <span id="cFavs"><a href="javascript:void(0);" class="btn_ora_white btn_addsj"
                                         onclick="javascript:BookDetail.AddFavorites(37,0,0);">加入书架</a>
@@ -196,27 +196,32 @@
     var pathname = window.location.pathname;
     var bookId = pathname.substring(pathname.lastIndexOf("/") + 1, pathname.lastIndexOf("."))
     //查询章节信息
-    $.ajax({
+    var lastBookIndexId = $("#lastBookIndexId").val();
-        type: "POST",
+    if(lastBookIndexId){
-        url: "/book/queryBookIndexAbout",
+        $.ajax({
-        data: {'bookId': bookId, 'lastBookIndexId': $("#lastBookIndexId").val()},
+            type: "POST",
-        dataType: "json",
+            url: "/book/queryBookIndexAbout",
-        success: function (data) {
+            data: {'bookId': bookId, 'lastBookIndexId': lastBookIndexId},
-            if (data.code == 200) {
+            dataType: "json",
-                var bookIndexData = data.data;
+            success: function (data) {
-                $("#bookIndexCount").html("(" + bookIndexData.bookIndexCount + "章)");
+                if (data.code == 200) {
-                $("#lastBookContent").html(bookIndexData.lastBookContent + "...");
+                    var bookIndexData = data.data;
+                    $("#bookIndexCount").html("(" + bookIndexData.bookIndexCount + "章)");
+                    $("#lastBookContent").html(bookIndexData.lastBookContent + "...");
 
 
-            } else {
+                } else {
-                layer.alert(data.msg);
+                    layer.alert(data.msg);
+                }
+
+            },
+            error: function () {
+                layer.alert('网络异常');
             }
-
+        })
-        },
+    }else{
-        error: function () {
+        $("#optBtn").remove();
-            layer.alert('网络异常');
+    }
-        }
-    })
 </script>
 <script language="javascript" type="text/javascript">
     //查询是否在书架

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=1&sort=last_index_update_time">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=2">修真小说</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">都市小说</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">历史小说</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">网游小说</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">科幻小说</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">女频小说</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=1&sort=last_index_update_time">玄幻小说</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=2&sort=last_index_update_time">修真小说</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=3&sort=last_index_update_time">都市小说</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=4&sort=last_index_update_time">历史小说</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=6&sort=last_index_update_time">网游小说</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=5&sort=last_index_update_time">科幻小说</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=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>