v3.2.0发布

README.md

@@ -2,26 +2,26 @@
 
 # 小说精品屋-plus
 
+#### 官网
+
+https://xiongxyang.gitee.io/home/
+
 #### 新项目：小说精品屋-微服务版
 
 基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
 
-Gitee仓库地址： https://gitee.com/xiongxyang/novel-cloud
-
 GitHub仓库地址： https://github.com/201206030/novel-cloud
 
+Gitee仓库地址： https://gitee.com/novel_dev_team/novel-cloud
+
 #### 演示地址
 
 [点击前往](http://47.106.243.172:8888/)
 
 
-#### 前言
-
-小说精品屋-plus致力于打造一个完整的商用小说门户平台，使用前建议先阅读此文档。
-
 #### 项目介绍
 
-小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
+小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能。
 
 小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
 
@@ -44,9 +44,9 @@ GitHub仓库地址： https://github.com/201206030/novel-cloud
 ```
 novel-plus -- 父工程
 ├── novel-common -- 通用模块
-├── novel-front -- 前台门户系统
-├── novel-crawl -- 爬虫管理系统
-└── novel-admin -- 后台管理系统
+├── novel-front -- 前台门户&作家后台管理子系统（可拆分）
+├── novel-crawl -- 爬虫管理子系统
+└── novel-admin -- 平台后台管理子系统
 ```
 
 #### 技术选型
@@ -76,6 +76,10 @@ novel-plus -- 父工程
 | Layui                | 前端UI                    
                  
 
+#### 接口文档
+
+[点击查看接口文档示例](./doc/api.md)
+
 #### PC站截图
 
 1. 首页
@@ -197,13 +201,13 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 #### 代码仓库
 
- Gitee仓库地址： https://gitee.com/xiongxyang/novel-plus
-
  GitHub仓库地址： https://github.com/201206030/novel-plus 
 
+ Gitee仓库地址： https://gitee.com/novel_dev_team/novel-plus
+
 #### QQ交流群
 
-![mini-code](https://s1.ax1x.com/2020/10/31/BUQVeI.png)
+[点击前往官网查看](https://xiongxyang.gitee.io/home/service.htm)
 
 #### 微信公众号（发布最新更新资讯）
 
@@ -224,7 +228,7 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。
 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
 
-#### 备注
+### 备注
 
 精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
 

doc/api.md

@@ -0,0 +1,116 @@
+
+ <h1 class="curproject-name"> 小说精品屋-plus </h1> 
+ 小说精品屋-plus接口
+
+
+# 作家模块
+
+## 小说章节分页列表查询接口
+<a id=小说章节分页列表查询接口> </a>
+### 基本信息
+
+**Path：** /book/queryIndexList
+
+**Method：** GET
+
+**接口描述：**
+<p>作家后台章节管理页面需要请求该接口获取小说章节分页列表信息</p>
+
+
+### 请求参数
+**Query**
+
+| 参数名称  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ |
+| bookId | 是  |  1334337530296893441 |  小说ID |
+| curr | 否  |  1 |  查询页码，默认1 |
+| limit | 否  |  5 |  分页大小，默认5 |
+
+### 返回数据
+
+<table>
+  <thead class="ant-table-thead">
+    <tr>
+      <th key=name>名称</th><th key=type>类型</th><th key=required>是否必须</th><th key=default>默认值</th><th key=desc>备注</th><th key=sub>其他信息</th>
+    </tr>
+  </thead><tbody className="ant-table-tbody"><tr key=0-0><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> code</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应状态吗，200表示成功</span></td><td key=5></td></tr><tr key=0-1><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> msg</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应信息</span></td><td key=5></td></tr><tr key=0-2><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> data</span></td><td key=1><span>object</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应数据</span></td><td key=5></td></tr><tr key=0-2-0><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> total</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">总数量</span></td><td key=5></td></tr><tr key=0-2-1><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> list</span></td><td key=1><span>object []</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">章节数据集合</span></td><td key=5><p key=3><span style="font-weight: '700'">item 类型: </span><span>object</span></p></td></tr><tr key=0-2-1-0><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> id</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">章节ID</span></td><td key=5></td></tr><tr key=0-2-1-1><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> bookId</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">小说ID</span></td><td key=5></td></tr><tr key=0-2-1-2><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> indexName</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">章节名</span></td><td key=5></td></tr><tr key=0-2-1-3><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> isVip</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">是否收费，1:收费，0:免费</span></td><td key=5></td></tr><tr key=0-2-1-4><td key=0><span style="padding-left: 40px"><span style="color: #8c8a8a">├─</span> updateTime</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">更新时间</span></td><td key=5></td></tr><tr key=0-2-2><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> pageNum</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">页码</span></td><td key=5></td></tr><tr key=0-2-3><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> pageSize</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">分页大小</span></td><td key=5></td></tr><tr key=0-2-4><td key=0><span style="padding-left: 20px"><span style="color: #8c8a8a">├─</span> size</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">当前页数量</span></td><td key=5></td></tr>
+               </tbody>
+              </table>
+            
+## 小说章节删除接口
+<a id=小说章节删除接口> </a>
+### 基本信息
+
+**Path：** /author/deleteIndex/{indexId}
+
+**Method：** DELETE
+
+**接口描述：**
+<p>作家后台章节管理页面点击删除按钮请求该接口删除小说章节内容</p>
+
+
+### 请求参数
+**Headers**
+
+| 参数名称  | 参数值  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| Content-Type  |  application/x-www-form-urlencoded | 是  |   |   |
+| Authorization  |   | 是  |  eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE2MDgzNDg0NzksInN1YiI6IntcImlkXCI6MTI1NTA2MDMyODMyMjAyNzUyMCxcInVzZXJuYW1lXCI6XCIxMzU2MDQyMTMyNFwiLFwibmlja05hbWVcIjpcIjEzNTYwNDIxMzI0XCJ9IiwiY3JlYXRlZCI6MTYwNzc0MzY3OTkxM30.0qhwis_zPb6t8wGNejMhDZ2iHCL9Tgh2UHd1gcQBCp8t6RW3ggSwtfo4l_RgMT_v8jOkLW91GzTVWlNnTE6LCA |  认证JWT，请求登录接口成功后返回 |
+**路径参数**
+
+| 参数名称 | 示例  | 备注  |
+| ------------ | ------------ | ------------ |
+| indexId |  1337603246936645632 |  章节ID |
+
+### 返回数据
+
+<table>
+  <thead class="ant-table-thead">
+    <tr>
+      <th key=name>名称</th><th key=type>类型</th><th key=required>是否必须</th><th key=default>默认值</th><th key=desc>备注</th><th key=sub>其他信息</th>
+    </tr>
+  </thead><tbody className="ant-table-tbody"><tr key=0-0><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> code</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应状态吗，200表示成功</span></td><td key=5></td></tr><tr key=0-1><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> msg</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应信息</span></td><td key=5></td></tr>
+               </tbody>
+              </table>
+            
+## 小说章节发布接口
+<a id=小说章节发布接口> </a>
+### 基本信息
+
+**Path：** /author/addBookContent
+
+**Method：** POST
+
+**接口描述：**
+<p>作家后台章节发布页面点击提交按钮请求该接口新增小说章节内容</p>
+
+
+### 请求参数
+**Headers**
+
+| 参数名称  | 参数值  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| Content-Type  |  application/x-www-form-urlencoded | 是  |   |   |
+| Authorization  |   | 是  |  eyJhbGciOiJIUzUxMiJ9.eyJleHAiOjE2MDgzNDg0NzksInN1YiI6IntcImlkXCI6MTI1NTA2MDMyODMyMjAyNzUyMCxcInVzZXJuYW1lXCI6XCIxMzU2MDQyMTMyNFwiLFwibmlja05hbWVcIjpcIjEzNTYwNDIxMzI0XCJ9IiwiY3JlYXRlZCI6MTYwNzc0MzY3OTkxM30.0qhwis_zPb6t8wGNejMhDZ2iHCL9Tgh2UHd1gcQBCp8t6RW3ggSwtfo4l_RgMT_v8jOkLW91GzTVWlNnTE6LCA |  认证JWT，请求登录接口成功后返回 |
+**Body**
+
+| 参数名称  | 参数类型  |  是否必须 | 示例  | 备注  |
+| ------------ | ------------ | ------------ | ------------ | ------------ |
+| bookId | text  |  是 |  1334337530296893441  |  小说ID |
+| indexName | text  |  是 |  第六章未婚妻（下）  |  章节名 |
+| content | text  |  是 |  开始之时，李七夜还是生疏无比，那怕他对于刀术的所有奥义了然于胸，但是，他出刀之时依然会颤抖，无法达到妙及巅毫的要求。  |  章节内容 |
+| isVip | text  |  是 |  1  |  是否收费，1:收费，0:免费 |
+
+
+
+### 返回数据
+
+<table>
+  <thead class="ant-table-thead">
+    <tr>
+      <th key=name>名称</th><th key=type>类型</th><th key=required>是否必须</th><th key=default>默认值</th><th key=desc>备注</th><th key=sub>其他信息</th>
+    </tr>
+  </thead><tbody className="ant-table-tbody"><tr key=0-0><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> code</span></td><td key=1><span>number</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应状态吗，200表示成功</span></td><td key=5></td></tr><tr key=0-1><td key=0><span style="padding-left: 0px"><span style="color: #8c8a8a"></span> msg</span></td><td key=1><span>string</span></td><td key=2>必须</td><td key=3></td><td key=4><span style="white-space: pre-wrap">响应信息</span></td><td key=5></td></tr>
+               </tbody>
+              </table>
+            

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>2.11.0</version>
+    <version>3.2.0</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>

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

@@ -1,5 +1,5 @@
 java2nb:
-  uploadPath: c:/var/java2nb/uploaded_files/
+  uploadPath: /var/pic/
   username: admin
   password: 111111
 logging:
@@ -10,7 +10,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
     username: root
     password: test123456
     #password:

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

@@ -147,7 +147,7 @@
                             <tr>
                                 <td>下载地址</td>
                                 <td>
-                                   <a href="https://gitee.com/xiongxyang/fiction_house" target="_blank">Gitee</a> /
+                                   <a href="https://gitee.com/novel_dev_team/fiction_house" target="_blank">Gitee</a> /
                                     <a href="https://github.com/201206030/fiction_house" target="_blank">Github</a>
                                 </td>
                             </tr>
@@ -155,8 +155,8 @@
                                 <td>Gitee</td>
                                 <td style="padding-bottom: 0;">
                                     <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/fiction_house/stargazers'><img src='https://gitee.com/xiongxyang/fiction_house/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/fiction_house/members'><img src='https://gitee.com/xiongxyang/fiction_house/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/fiction_house/stargazers'><img src='https://gitee.com/novel_dev_team/fiction_house/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/fiction_house/members'><img src='https://gitee.com/novel_dev_team/fiction_house/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                     </div>
                                 </td>
                             </tr>
@@ -200,7 +200,7 @@
                             <tr>
                                 <td>下载地址</td>
                                 <td>
-                                    <a href="https://gitee.com/xiongxyang/novel-plus" target="_blank">Gitee</a> /
+                                    <a href="https://gitee.com/novel_dev_team/novel-plus" target="_blank">Gitee</a> /
                                     <a href="https://github.com/201206030/novel-plus" target="_blank">Github</a>
                                 </td>
                             </tr>
@@ -208,8 +208,8 @@
                                 <td>Gitee</td>
                                 <td style="padding-bottom: 0;">
                                     <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/novel-plus/stargazers'><img src='https://gitee.com/xiongxyang/novel-plus/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/novel-plus/members'><img src='https://gitee.com/xiongxyang/novel-plus/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-plus/stargazers'><img src='https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-plus/members'><img src='https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                     </div>
                                 </td>
                             </tr>
@@ -253,7 +253,7 @@
                             <tr>
                                 <td>下载地址</td>
                                 <td>
-                                    <a href="https://gitee.com/xiongxyang/novel-cloud" target="_blank">Gitee</a> /
+                                    <a href="https://gitee.com/novel_dev_team/novel-cloud" target="_blank">Gitee</a> /
                                     <a href="https://github.com/201206030/novel-cloud" target="_blank">Github</a>
                                 </td>
                             </tr>
@@ -261,8 +261,8 @@
                                 <td>Gitee</td>
                                 <td style="padding-bottom: 0;">
                                     <div class="layui-btn-container">
-                                        <a href='https://gitee.com/xiongxyang/novel-cloud/stargazers'><img src='https://gitee.com/xiongxyang/novel-cloud/badge/star.svg?theme=dark' alt='star'></img></a>
-                                        <a href='https://gitee.com/xiongxyang/novel-cloud/members'><img src='https://gitee.com/xiongxyang/novel-cloud/badge/fork.svg?theme=dark' alt='fork'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-cloud/stargazers'><img src='https://gitee.com/novel_dev_team/novel-cloud/badge/star.svg?theme=dark' alt='star'></img></a>
+                                        <a href='https://gitee.com/novel_dev_team/novel-cloud/members'><img src='https://gitee.com/novel_dev_team/novel-cloud/badge/fork.svg?theme=dark' alt='fork'></img></a>
                                     </div>
                                 </td>
                             </tr>

novel-common/pom.xml

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

novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java

@@ -1,21 +1,30 @@
 package com.java2nb.novel.core.advice;
 
 import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 /**
  * 通用的异常处理器
  *
  * @author 11797*/
 @Slf4j
-@ControllerAdvice
-@ResponseBody
+@RestControllerAdvice(basePackages = "com.java2nb.novel.controller")
 public class CommonExceptionHandler {
 
+    /**
+     * 处理后台数据校验异常
+     * */
+    @ExceptionHandler(BindException.class)
+    public ResultBean handlerBindException(BindException e){
+        log.error(e.getMessage(),e);
+        return ResultBean.fail(ResponseStatus.PARAM_ERROR);
+    }
+
     /**
      * 处理业务异常
      * */

novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java

@@ -0,0 +1,26 @@
+package com.java2nb.novel.core.advice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * 页面异常处理器
+ *
+ * @author 11797
+ */
+@Slf4j
+@ControllerAdvice(basePackages = "com.java2nb.novel.page")
+public class PageExceptionHandler {
+
+
+    /**
+     * 处理所有异常
+     */
+    @ExceptionHandler(Exception.class)
+    public String handlerException(Exception e) {
+        log.error(e.getMessage(), e);
+        //跳转页面过程中出现异常时统一跳转到404页面
+        return "404";
+    }
+}

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

@@ -1,9 +1,6 @@
 package com.java2nb.novel.core.utils;
 
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 /**
@@ -28,4 +25,23 @@ public class HttpUtil {
             return null;
         }
     }
+
+    public static String getByHttpClientWithChrome(String url) {
+        try {
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("user-agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36");
+            HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
+            ResponseEntity<String> forEntity = restTemplate.exchange(url.toString(), HttpMethod.GET, requestEntity, String.class);
+
+            if (forEntity.getStatusCode() == HttpStatus.OK) {
+                return forEntity.getBody();
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

novel-common/src/main/java/com/java2nb/novel/core/valid/AddGroup.java

@@ -0,0 +1,11 @@
+package com.java2nb.novel.core.valid;
+
+/**
+ * 新增数据的校验分组
+ * @author xiongxiaoyang
+ */
+public interface AddGroup {
+
+
+
+}

novel-common/src/main/java/com/java2nb/novel/core/valid/UpdateGroup.java

@@ -0,0 +1,11 @@
+package com.java2nb.novel.core.valid;
+
+/**
+ * 更新数据的校验分组
+ * @author xiongxiaoyang
+ */
+public interface UpdateGroup {
+
+
+
+}

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

@@ -1,36 +1,56 @@
 package com.java2nb.novel.entity;
 
+import com.java2nb.novel.core.valid.AddGroup;
+import com.java2nb.novel.core.valid.UpdateGroup;
+
 import java.util.Date;
 import javax.annotation.Generated;
+import javax.validation.constraints.*;
 
 public class User {
+
+    @Null(groups = {AddGroup.class, UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long id;
 
+
+    @NotBlank(groups = {AddGroup.class},message="手机号不能为空！")
+    @Pattern(groups = {AddGroup.class},regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！")
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String username;
 
+    @NotBlank(groups = {AddGroup.class},message="密码不能为空！")
+    @Null(groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String password;
 
+    @Null(groups = {AddGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String nickName;
 
+    @Null(groups = {AddGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String userPhoto;
 
+    @Null(groups = {AddGroup.class})
+    @Min(value = 0,groups = {UpdateGroup.class})
+    @Max(value = 1,groups = {UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte userSex;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Long accountBalance;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte status;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date createTime;
 
+    @Null(groups = {AddGroup.class,UpdateGroup.class})
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date updateTime;
 

novel-crawl/pom.xml

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

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

@@ -9,10 +9,7 @@ import com.java2nb.novel.service.CrawlService;
 import com.java2nb.novel.vo.CrawlSingleTaskVO;
 import com.java2nb.novel.vo.CrawlSourceVO;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author Administrator
@@ -39,7 +36,7 @@ public class CrawlController {
     /**
      * 爬虫源分页列表查询
      * */
-    @PostMapping("listCrawlByPage")
+    @GetMapping("listCrawlByPage")
     public ResultBean listCrawlByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize){
 
         return ResultBean.ok(new PageInfo<>(BeanUtil.copyList(crawlService.listCrawlByPage(page,pageSize), CrawlSourceVO.class)
@@ -71,7 +68,7 @@ public class CrawlController {
     /**
      * 单本采集任务分页列表查询
      * */
-    @PostMapping("listCrawlSingleTaskByPage")
+    @GetMapping("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)
@@ -81,8 +78,8 @@ public class CrawlController {
     /**
      * 删除采集任务
      * */
-    @PostMapping("delCrawlSingleTask")
-    public ResultBean delCrawlSingleTask(Long id){
+    @DeleteMapping("delCrawlSingleTask/{id}")
+    public ResultBean delCrawlSingleTask(@PathVariable("id") Long id){
 
         crawlService.delCrawlSingleTask(id);
 

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java

@@ -1,9 +1,6 @@
 package com.java2nb.novel.core.crawl;
 
-import com.java2nb.novel.core.utils.HttpUtil;
-import com.java2nb.novel.core.utils.IdWorker;
-import com.java2nb.novel.core.utils.RandomBookInfoUtil;
-import com.java2nb.novel.core.utils.RestTemplateUtil;
+import com.java2nb.novel.core.utils.*;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
@@ -11,8 +8,7 @@ import com.java2nb.novel.utils.Constants;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
@@ -38,13 +34,13 @@ public class CrawlParser {
 
     private static RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");
 
-    private static ThreadLocal <Integer> retryCount = new ThreadLocal<>();
+    private static ThreadLocal<Integer> retryCount = new ThreadLocal<>();
 
     @SneakyThrows
     public static Book parseBook(RuleBean ruleBean, String bookId) {
         Book book = new Book();
         String bookDetailUrl = ruleBean.getBookDetailUrl().replace("{bookId}", bookId);
-        String bookDetailHtml = getByHttpClient(bookDetailUrl);
+        String bookDetailHtml = getByHttpClientWithChrome(bookDetailUrl);
         if (bookDetailHtml != null) {
             Pattern bookNamePatten = compile(ruleBean.getBookNamePatten());
             Matcher bookNameMatch = bookNamePatten.matcher(bookDetailHtml);
@@ -66,7 +62,7 @@ public class CrawlParser {
                         boolean isFindPicUrl = picUrlMatch.find();
                         if (isFindPicUrl) {
                             String picUrl = picUrlMatch.group(1);
-                            if(StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
+                            if (StringUtils.isNotBlank(picUrl) && StringUtils.isNotBlank(ruleBean.getPicUrlPrefix())) {
                                 picUrl = ruleBean.getPicUrlPrefix() + picUrl;
                             }
                             //设置封面图片路径
@@ -97,11 +93,11 @@ public class CrawlParser {
                     String desc = bookDetailHtml.substring(bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
                     desc = desc.substring(0, desc.indexOf(ruleBean.getDescEnd()));
                     //过滤掉简介中的特殊标签
-                    desc = desc.replaceAll("<a[^<]+</a>","")
-                            .replaceAll("<font[^<]+</font>","")
-                            .replaceAll("<p>\\s*</p>","")
-                            .replaceAll("<p>","")
-                            .replaceAll("</p>","<br/>");
+                    desc = desc.replaceAll("<a[^<]+</a>", "")
+                            .replaceAll("<font[^<]+</font>", "")
+                            .replaceAll("<p>\\s*</p>", "")
+                            .replaceAll("<p>", "")
+                            .replaceAll("</p>", "<br/>");
                     //设置书籍简介
                     book.setBookDesc(desc);
                     if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@@ -147,9 +143,9 @@ public class CrawlParser {
     }
 
     public static Map<Integer, List> parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Map<Integer, BookIndex> hasIndexs) {
-        Map<Integer,List> result = new HashMap<>(2);
-        result.put(BOOK_INDEX_LIST_KEY,new ArrayList(0));
-        result.put(BOOK_CONTENT_LIST_KEY,new ArrayList(0));
+        Map<Integer, List> result = new HashMap<>(2);
+        result.put(BOOK_INDEX_LIST_KEY, new ArrayList(0));
+        result.put(BOOK_CONTENT_LIST_KEY, new ArrayList(0));
 
         Date currentDate = new Date();
 
@@ -157,10 +153,10 @@ public class CrawlParser {
         List<BookContent> contentList = new ArrayList<>();
         //读取目录
         String indexListUrl = ruleBean.getBookIndexUrl().replace("{bookId}", sourceBookId);
-        String indexListHtml = getByHttpClient(indexListUrl);
+        String indexListHtml = getByHttpClientWithChrome(indexListUrl);
 
         if (indexListHtml != null) {
-            if(StringUtils.isNotBlank(ruleBean.getBookIndexStart())){
+            if (StringUtils.isNotBlank(ruleBean.getBookIndexStart())) {
                 indexListHtml = indexListHtml.substring(indexListHtml.indexOf(ruleBean.getBookIndexStart()) + ruleBean.getBookIndexStart().length());
             }
 
@@ -175,10 +171,7 @@ public class CrawlParser {
             int indexNum = 0;
 
             //总字数
-            Integer totalWordCount = 0;
-            //最新目录
-            Long lastIndexId = null;
-            String lastIndexName = null;
+            Integer totalWordCount = book.getWordCount() == null ? 0 : book.getWordCount();
 
             while (isFindIndex) {
 
@@ -186,61 +179,81 @@ public class CrawlParser {
                 String indexName = indexNameMatch.group(1);
 
                 if (hasIndex == null || !StringUtils.deleteWhitespace(hasIndex.getIndexName()).equals(StringUtils.deleteWhitespace(indexName))) {
-                    String contentUrl = ruleBean.getBookContentUrl().replace("{bookId}", sourceBookId).replace("{indexId}", indexIdMatch.group(1));
+
+                    String sourceIndexId = indexIdMatch.group(1);
+                    String bookContentUrl = ruleBean.getBookContentUrl();
+                    int calStart = bookContentUrl.indexOf("{cal_");
+                    if (calStart != -1) {
+                        //内容页URL需要进行计算才能得到
+                        String calStr = bookContentUrl.substring(calStart, calStart + bookContentUrl.substring(calStart).indexOf("}"));
+                        String[] calArr = calStr.split("_");
+                        int calType = Integer.parseInt(calArr[1]);
+                        if (calType == 1) {
+                            ///{cal_1_1_3}_{bookId}/{indexId}.html
+                            //第一种计算规则，去除第x个参数的最后y个字母
+                            int x = Integer.parseInt(calArr[2]);
+                            int y = Integer.parseInt(calArr[3]);
+                            String calResult;
+                            if (x == 1) {
+                                calResult = sourceBookId.substring(0, sourceBookId.length() - y);
+                            } else {
+                                calResult = sourceIndexId.substring(0, sourceBookId.length() - y);
+                            }
+
+                            if (calResult.length() == 0) {
+                                calResult = "0";
+
+                            }
+
+                            bookContentUrl = bookContentUrl.replace(calStr + "}", calResult);
+                        }
+
+                    }
+
+                    String contentUrl = bookContentUrl.replace("{bookId}", sourceBookId).replace("{indexId}", sourceIndexId);
 
                     //查询章节内容
-                    String contentHtml = getByHttpClient(contentUrl);
+                    String contentHtml = getByHttpClientWithChrome(contentUrl);
                     if (contentHtml != null && !contentHtml.contains("正在手打中")) {
                         String content = contentHtml.substring(contentHtml.indexOf(ruleBean.getContentStart()) + ruleBean.getContentStart().length());
                         content = content.substring(0, content.indexOf(ruleBean.getContentEnd()));
-                        //TODO插入章节目录和章节内容
+                        //插入章节目录和章节内容
                         BookIndex bookIndex = new BookIndex();
-
                         bookIndex.setIndexName(indexName);
                         bookIndex.setIndexNum(indexNum);
+                        Integer wordCount = StringUtil.getStrValidWordCount(content);
+                        bookIndex.setWordCount(wordCount);
                         indexList.add(bookIndex);
-                        BookContent bookContent = new BookContent();
 
+                        BookContent bookContent = new BookContent();
                         bookContent.setContent(content);
                         contentList.add(bookContent);
 
-                        //判断是新增还是更新
-                        if(hasIndexs.size() == 0){
-                            //新书入库
+                        if (hasIndex != null) {
+                            //章节更新
+                            bookIndex.setId(hasIndex.getId());
+                            bookContent.setIndexId(hasIndex.getId());
+
+                            //计算总字数
+                            totalWordCount = (totalWordCount+wordCount-hasIndex.getWordCount());
+                        } else {
+                            //章节插入
                             //设置目录和章节内容
                             Long indexId = idWorker.nextId();
-                            lastIndexId = indexId;
-                            lastIndexName = indexName;
                             bookIndex.setId(indexId);
                             bookIndex.setBookId(book.getId());
-                            Integer wordCount = bookContent.getContent().length();
-                            totalWordCount += wordCount;
-                            bookIndex.setWordCount(wordCount);
+
                             bookIndex.setCreateTime(currentDate);
-                            bookIndex.setUpdateTime(currentDate);
 
                             bookContent.setIndexId(indexId);
 
-                            //设置小说基础信息
-                            book.setWordCount(totalWordCount);
-                            book.setLastIndexId(lastIndexId);
-                            book.setLastIndexName(lastIndexName);
-                            book.setLastIndexUpdateTime(currentDate);
-                            book.setCreateTime(currentDate);
-                            book.setUpdateTime(currentDate);
-
-                        }else{
-                            //老书更新
+                            //计算总字数
+                            totalWordCount += wordCount;
                         }
+                        bookIndex.setUpdateTime(currentDate);
 
 
 
-                        if(hasIndex != null){
-                            bookIndex.setId(hasIndex.getId());
-                            bookContent.setIndexId(hasIndex.getId());
-                        }
-
-
                     }
 
 
@@ -249,15 +262,29 @@ public class CrawlParser {
                 isFindIndex = indexIdMatch.find() & indexNameMatch.find();
             }
 
+
+            if (indexList.size() > 0) {
+                //如果有爬到最新章节，则设置小说主表的最新章节信息
+                //获取爬取到的最新章节
+                BookIndex lastIndex = indexList.get(indexList.size()-1);
+                book.setLastIndexId(lastIndex.getId());
+                book.setLastIndexName(lastIndex.getIndexName());
+                book.setLastIndexUpdateTime(currentDate);
+
+            }
+            book.setWordCount(totalWordCount);
+            book.setUpdateTime(currentDate);
+
             if (indexList.size() == contentList.size() && indexList.size() > 0) {
 
-                result.put(BOOK_INDEX_LIST_KEY,indexList);
-                result.put(BOOK_CONTENT_LIST_KEY,contentList);
+                result.put(BOOK_INDEX_LIST_KEY, indexList);
+                result.put(BOOK_CONTENT_LIST_KEY, contentList);
 
             }
 
         }
 
+
         return result;
     }
 
@@ -267,7 +294,7 @@ public class CrawlParser {
             ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
             if (forEntity.getStatusCode() == HttpStatus.OK) {
                 String body = forEntity.getBody();
-                if(body.length() < Constants.INVALID_HTML_LENGTH){
+                if (body.length() < Constants.INVALID_HTML_LENGTH) {
                     return processErrorHttpResult(url);
                 }
                 //成功获得html内容
@@ -280,14 +307,30 @@ public class CrawlParser {
 
     }
 
+    private static String getByHttpClientWithChrome(String url) {
+        try {
+
+            String body = HttpUtil.getByHttpClientWithChrome(url);
+            if (body != null && body.length() < Constants.INVALID_HTML_LENGTH) {
+                return processErrorHttpResult(url);
+            }
+            //成功获得html内容
+            return body;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return processErrorHttpResult(url);
+
+    }
+
     @SneakyThrows
-    private static String processErrorHttpResult(String url){
+    private static String processErrorHttpResult(String url) {
         Integer count = retryCount.get();
-        if(count == null){
+        if (count == null) {
             count = 0;
         }
-        if(count < Constants.HTTP_FAIL_RETRY_COUNT){
-            Thread.sleep(  new Random().nextInt(10*1000));
+        if (count < Constants.HTTP_FAIL_RETRY_COUNT) {
+            Thread.sleep(new Random().nextInt(10 * 1000));
             retryCount.set(++count);
             return getByHttpClient(url);
         }

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

@@ -58,6 +58,7 @@ public class StarterListener implements ServletContextListener {
                                 Book book = CrawlParser.parseBook(ruleBean, needUpdateBook.getCrawlBookId());
                                 //这里只做老书更新
                                 book.setId(needUpdateBook.getId());
+                                book.setWordCount(needUpdateBook.getWordCount());
                                 if (needUpdateBook.getPicUrl() != null && needUpdateBook.getPicUrl().contains(Constants.LOCAL_PIC_PREFIX)) {
                                     //本地图片则不更新
                                     book.setPicUrl(null);

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

@@ -65,9 +65,8 @@ public interface BookService {
      * @param book 小说数据
      * @param bookIndexList 目录集合
      * @param bookContentList 内容集合
-     * @param existBookIndexMap  已存在的章节Map
-     * */
-    void updateBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap);
+     * @param existBookIndexMap  已存在的章节Map   */
+    void updateBookAndIndexAndContent(Book book,  List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap);
 
     /**
      * 更新一下最后一次的抓取时间

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

@@ -1,6 +1,5 @@
 package com.java2nb.novel.service.impl;
 
-import com.java2nb.novel.core.utils.IdWorker;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
@@ -79,12 +78,9 @@ public class BookServiceImpl implements BookService {
 
             if(bookIndexList.size()>0) {
 
-                if (book.getId() == null) {
-                    book.setId(new IdWorker().nextId());
-                }
-
                 //保存小说主表
 
+                book.setCreateTime(new Date());
                 bookMapper.insertSelective(book);
 
                 //批量保存目录和内容
@@ -109,7 +105,7 @@ public class BookServiceImpl implements BookService {
 
     @Override
     public Map<Integer, BookIndex> queryExistBookIndexMap(Long bookId) {
-        List<BookIndex> bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id,BookIndexDynamicSqlSupport.indexNum,BookIndexDynamicSqlSupport.indexName)
+        List<BookIndex> bookIndexs = bookIndexMapper.selectMany(select(BookIndexDynamicSqlSupport.id,BookIndexDynamicSqlSupport.indexNum,BookIndexDynamicSqlSupport.indexName,BookIndexDynamicSqlSupport.wordCount)
                 .from(BookIndexDynamicSqlSupport.bookIndex)
                 .where(BookIndexDynamicSqlSupport.bookId,isEqualTo(bookId))
                 .build()
@@ -122,36 +118,19 @@ public class BookServiceImpl implements BookService {
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void updateBookAndIndexAndContent(Book book, List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap) {
-        Date currentDate = new Date();
+    public void updateBookAndIndexAndContent(Book book,  List<BookIndex> bookIndexList, List<BookContent> bookContentList, Map<Integer, BookIndex> existBookIndexMap) {
         for (int i = 0; i < bookIndexList.size(); i++) {
             BookIndex bookIndex = bookIndexList.get(i);
             BookContent bookContent = bookContentList.get(i);
 
-            //插入或更新目录
-            Integer wordCount = bookContent.getContent().length();
-            bookIndex.setWordCount(wordCount);
-            bookIndex.setUpdateTime(currentDate);
 
-            if(bookIndex.getId() == null) {
+            if(!existBookIndexMap.containsKey(bookIndex.getIndexNum())) {
                 //插入
-                bookIndex.setBookId(book.getId());
-                Long indexId = new IdWorker().nextId();
-                bookIndex.setId(indexId);
-                bookIndex.setCreateTime(currentDate);
                 bookIndexMapper.insertSelective(bookIndex);
-            }else{
-                //更新
-                bookIndexMapper.updateByPrimaryKeySelective(bookIndex);
-            }
-
-            if(bookContent.getIndexId() == null) {
-                //插入
-                bookContent.setIndexId(bookIndex.getId());
                 bookContentMapper.insertSelective(bookContent);
             }else{
                 //更新
-
+                bookIndexMapper.updateByPrimaryKeySelective(bookIndex);
                 bookContentMapper.update(update(BookContentDynamicSqlSupport.bookContent)
                         .set(BookContentDynamicSqlSupport.content)
                         .equalTo(bookContent.getContent())
@@ -160,21 +139,10 @@ public class BookServiceImpl implements BookService {
                         .render(RenderingStrategies.MYBATIS3));
             }
 
+
         }
 
         //更新小说主表
-        if(bookIndexList.size()>0) {
-            //有更新章节，才需要更新以下字段
-            book.setWordCount(queryTotalWordCount(book.getId()));
-            BookIndex lastIndex = bookIndexList.get(bookIndexList.size()-1);
-            if(!existBookIndexMap.containsKey(lastIndex.getIndexNum())) {
-                //如果最新章节不在已存在章节中，那么更新小说表最新章节信息
-                book.setLastIndexId(lastIndex.getId());
-                book.setLastIndexName(lastIndex.getIndexName());
-                book.setLastIndexUpdateTime(currentDate);
-            }
-        }
-        book.setUpdateTime(currentDate);
         book.setBookName(null);
         book.setAuthorName(null);
         if(Constants.VISIT_COUNT_DEFAULT.equals(book.getVisitCount())) {

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

@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static com.java2nb.novel.core.utils.HttpUtil.getByHttpClient;
+import static com.java2nb.novel.core.utils.HttpUtil.getByHttpClientWithChrome;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlBookId;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.crawlSourceId;
 import static com.java2nb.novel.mapper.CrawlSourceDynamicSqlSupport.*;
@@ -217,7 +218,7 @@ public class CrawlServiceImpl implements CrawlService {
                             .replace("{catId}", ruleBean.getCatIdRule().get("catId" + catId))
                             .replace("{page}", page + "");
 
-                    String bookListHtml = getByHttpClient(catBookListUrl);
+                    String bookListHtml = getByHttpClientWithChrome(catBookListUrl);
                     if (bookListHtml != null) {
                         Pattern bookIdPatten = Pattern.compile(ruleBean.getBookIdPatten());
                         Matcher bookIdMatcher = bookIdPatten.matcher(bookListHtml);

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

@@ -5,7 +5,7 @@
 
     <select id="queryNeedUpdateBook" resultType="com.java2nb.novel.entity.Book">
 
-        select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url
+        select id,crawl_source_id,crawl_book_id,crawl_last_time,pic_url,word_count
         from book where last_index_update_time > #{startDate} and crawl_source_id is not null
         order by crawl_last_time
         limit ${limit}
@@ -15,8 +15,7 @@
 
     <select id="queryTotalWordCount" parameterType="long" resultType="int">
 
-        select sum(t2.word_count) from book t1 inner join book_index t2
-        on t1.id = t2.book_id and t1.id = #{bookId}
+        select sum(word_count) from book_index where book_id = #{bookId}
     </select>
 
     <update id="updateCrawlLastTime">

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

@@ -96,7 +96,7 @@
 <script language="javascript" type="text/javascript">
     $(function () {
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/crawl/listCrawlByPage",
             data: {'curr':1,'limit':100},
             dataType: "json",

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

@@ -125,7 +125,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/crawl/listCrawlSingleTaskByPage",
             data: {'curr': curr, 'limit': limit},
             dataType: "json",
@@ -205,9 +205,9 @@
     function del(id) {
 
         $.ajax({
-            type: "POST",
-            url: "/crawl/delCrawlSingleTask",
-            data: {'id': id},
+            type: "delete",
+            url: "/crawl/delCrawlSingleTask/"+id,
+            data: {},
             dataType: "json",
             success: function (data) {
                 if (data.code == 200) {

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

@@ -117,7 +117,7 @@
                                 示例：<b></b>
                                 <li><input type="text" id="visitCountPatten" class="s_input icon_key"
                                            placeholder="小说点击量的正则表达式："></li>
-                                示例：<b>&lt;p class=\"review\"&gt;</b>
+                                示例：<b>&lt;p class="review"&gt;</b>
                                 <li><input type="text" id="descStart" class="s_input icon_key"
                                            placeholder="小说简介开始截取字符串："></li>
                                 示例：<b>&lt;/p&gt;</b>

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

@@ -122,7 +122,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/crawl/listCrawlByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

novel-front/pom.xml

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

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

@@ -13,10 +13,7 @@ import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.FriendLinkService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -38,7 +35,7 @@ public class AuthorController extends BaseController{
     /**
      * 校验笔名是否存在
      * */
-    @PostMapping("checkPenName")
+    @GetMapping("checkPenName")
     public ResultBean checkPenName(String penName){
 
         return ResultBean.ok(authorService.checkPenName(penName));
@@ -47,7 +44,7 @@ public class AuthorController extends BaseController{
     /**
      * 作家发布小说分页列表查询
      * */
-    @PostMapping("listBookByPage")
+    @GetMapping("listBookByPage")
     public ResultBean listBookByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize ,HttpServletRequest request){
 
         return ResultBean.ok(new PageInfo<>(bookService.listBookPageByUserId(getUserDetails(request).getId(),page,pageSize)
@@ -90,8 +87,8 @@ public class AuthorController extends BaseController{
     /**
      * 删除章节
      */
-    @PostMapping("deleteIndex")
-    public ResultBean deleteIndex(Long indexId,  HttpServletRequest request) {
+    @DeleteMapping("deleteIndex/{indexId}")
+    public ResultBean deleteIndex(@PathVariable("indexId") Long indexId,  HttpServletRequest request) {
 
         Author author = checkAuthor(request);
 
@@ -136,8 +133,8 @@ public class AuthorController extends BaseController{
     /**
      * 查询章节内容
      */
-    @PostMapping("queryIndexContent")
-    public ResultBean queryIndexContent(Long indexId,  HttpServletRequest request) {
+    @GetMapping("queryIndexContent/{indexId}")
+    public ResultBean queryIndexContent(@PathVariable("indexId") Long indexId,  HttpServletRequest request) {
 
         Author author = checkAuthor(request);
 
@@ -167,7 +164,7 @@ public class AuthorController extends BaseController{
     /**
      * 作家日收入统计数据分页列表查询
      * */
-    @PostMapping("listIncomeDailyByPage")
+    @GetMapping("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,
@@ -183,7 +180,7 @@ public class AuthorController extends BaseController{
     /**
      * 作家月收入统计数据分页列表查询
      * */
-    @PostMapping("listIncomeMonthByPage")
+    @GetMapping("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,

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

@@ -12,10 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
@@ -41,7 +38,7 @@ public class BookController extends BaseController{
     /**
      * 查询首页小说设置列表数据
      * */
-    @PostMapping("listBookSetting")
+    @GetMapping("listBookSetting")
     public ResultBean listBookSetting(){
         return ResultBean.ok(bookService.listBookSettingVO());
     }
@@ -49,7 +46,7 @@ public class BookController extends BaseController{
     /**
      * 查询首页点击榜单数据
      * */
-    @PostMapping("listClickRank")
+    @GetMapping("listClickRank")
     public ResultBean listClickRank(){
         return ResultBean.ok(bookService.listClickRank());
     }
@@ -57,7 +54,7 @@ public class BookController extends BaseController{
     /**
      * 查询首页新书榜单数据
      * */
-    @PostMapping("listNewRank")
+    @GetMapping("listNewRank")
     public ResultBean listNewRank(){
         return ResultBean.ok(bookService.listNewRank());
     }
@@ -65,7 +62,7 @@ public class BookController extends BaseController{
     /**
      * 查询首页更新榜单数据
      * */
-    @PostMapping("listUpdateRank")
+    @GetMapping("listUpdateRank")
     public ResultBean listUpdateRank(){
         return ResultBean.ok(bookService.listUpdateRank());
     }
@@ -73,7 +70,7 @@ public class BookController extends BaseController{
     /**
      * 查询小说分类列表
      * */
-    @PostMapping("listBookCategory")
+    @GetMapping("listBookCategory")
     public ResultBean listBookCategory(){
         return ResultBean.ok(bookService.listBookCategory());
     }
@@ -81,7 +78,7 @@ public class BookController extends BaseController{
     /**
      * 分页搜索
      * */
-    @PostMapping("searchByPage")
+    @GetMapping("searchByPage")
     public ResultBean searchByPage(BookSP bookSP, @RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "20") int pageSize){
         PageInfo<BookVO> pageInfo = bookService.searchByPage(bookSP,page,pageSize);
         return ResultBean.ok(pageInfo);
@@ -90,8 +87,8 @@ public class BookController extends BaseController{
     /**
      * 查询小说详情信息
      * */
-    @PostMapping("queryBookDetail")
-    public ResultBean queryBookDetail(Long id){
+    @GetMapping("queryBookDetail/{id}")
+    public ResultBean queryBookDetail(@PathVariable("id") Long id){
         return ResultBean.ok(bookService.queryBookDetail(id));
     }
 
@@ -99,7 +96,7 @@ public class BookController extends BaseController{
     /**
      * 查询小说排行信息
      * */
-    @PostMapping("listRank")
+    @GetMapping("listRank")
     public ResultBean listRank(@RequestParam(value = "type",defaultValue = "0") Byte type,@RequestParam(value = "limit",defaultValue = "30") Integer limit){
         return ResultBean.ok(bookService.listRank(type,limit));
     }
@@ -120,7 +117,7 @@ public class BookController extends BaseController{
     /**
      * 查询章节相关信息
      * */
-    @PostMapping("queryBookIndexAbout")
+    @GetMapping("queryBookIndexAbout")
     public ResultBean queryBookIndexAbout(Long bookId,Long lastBookIndexId) {
         Map<String,Object> data = new HashMap<>(2);
         data.put("bookIndexCount",bookService.queryIndexCount(bookId));
@@ -135,7 +132,7 @@ public class BookController extends BaseController{
     /**
      * 根据分类id查询同类推荐书籍
      * */
-    @PostMapping("listRecBookByCatId")
+    @GetMapping("listRecBookByCatId")
     public ResultBean listRecBookByCatId(Integer catId) {
         return ResultBean.ok(bookService.listRecBookByCatId(catId));
     }
@@ -144,7 +141,7 @@ public class BookController extends BaseController{
     /**
      *分页查询书籍评论列表
      * */
-    @PostMapping("listCommentByPage")
+    @GetMapping("listCommentByPage")
     public ResultBean listCommentByPage(@RequestParam("bookId") Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
         return ResultBean.ok(new PageInfo<>(bookService.listCommentByPage(null,bookId,page,pageSize)));
     }
@@ -165,7 +162,7 @@ public class BookController extends BaseController{
     /**
      * 根据小说ID查询小说前十条最新更新目录集合
      * */
-    @PostMapping("queryNewIndexList")
+    @GetMapping("queryNewIndexList")
     public ResultBean queryNewIndexList(Long bookId){
         return ResultBean.ok(bookService.queryIndexList(bookId,"index_num desc",1,10));
     }
@@ -173,8 +170,8 @@ public class BookController extends BaseController{
     /**
      * 目录页
      * */
-    @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) {
+    @GetMapping("/queryIndexList")
+    public ResultBean indexList(Long bookId,@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,@RequestParam(value = "orderBy",defaultValue = "index_num desc") String orderBy) {
         return ResultBean.ok(new PageInfo<>(bookService.queryIndexList(bookId,orderBy,page,pageSize)));
     }
 

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

@@ -4,6 +4,7 @@ import com.java2nb.novel.core.bean.ResultBean;
 import com.java2nb.novel.service.FriendLinkService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,7 +23,7 @@ public class FriendLinkController {
     /**
      * 查询首页友情链接
      * */
-    @PostMapping("listIndexLink")
+    @GetMapping("listIndexLink")
     public ResultBean listIndexLink(){
         return ResultBean.ok(friendLinkService.listIndexLink());
     }

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

@@ -5,10 +5,7 @@ import com.java2nb.novel.core.bean.ResultBean;
 import com.java2nb.novel.service.NewsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author 11797
@@ -24,7 +21,7 @@ public class NewsController {
     /**
      * 查询首页新闻
      * */
-    @PostMapping("listIndexNews")
+    @GetMapping("listIndexNews")
     public ResultBean listIndexNews(){
         return ResultBean.ok(newsService.listIndexNews());
     }
@@ -32,7 +29,7 @@ public class NewsController {
     /**
      * 分页查询新闻列表
      * */
-    @PostMapping("listByPage")
+    @GetMapping("listByPage")
     public ResultBean listByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize){
         return ResultBean.ok(new PageInfo<>(newsService.listByPage(page,pageSize)));
     }

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

@@ -6,19 +6,17 @@ import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
+import com.java2nb.novel.core.valid.AddGroup;
+import com.java2nb.novel.core.valid.UpdateGroup;
 import com.java2nb.novel.entity.User;
 import com.java2nb.novel.entity.UserBuyRecord;
-import com.java2nb.novel.form.UserForm;
 import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.UserService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -45,12 +43,7 @@ public class UserController extends BaseController {
      * 登陆
      */
     @PostMapping("login")
-    public ResultBean login(@Valid UserForm user, BindingResult result) {
-        //判断参数是否合法
-        if (result.hasErrors()) {
-            log.info(result.getAllErrors().toString());
-            return ResultBean.fail(ResponseStatus.PARAM_ERROR);
-        }
+    public ResultBean login(User user) {
 
         //登陆
         UserDetails userDetails = userService.login(user);
@@ -67,13 +60,8 @@ public class UserController extends BaseController {
      * 注册
      */
     @PostMapping("register")
-    public ResultBean register(@Valid UserForm user, @RequestParam(value = "velCode", defaultValue = "") String velCode, BindingResult result) {
+    public ResultBean register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
 
-        //判断参数是否合法
-        if (result.hasErrors()) {
-            log.info(result.getAllErrors().toString());
-            return ResultBean.fail(ResponseStatus.PARAM_ERROR);
-        }
 
         //判断验证码是否正确
         if (!velCode.equals(cacheService.get(RandomValidateCodeUtil.RANDOM_CODE_KEY))) {
@@ -115,7 +103,7 @@ public class UserController extends BaseController {
     /**
      * 查询小说是否已加入书架
      */
-    @PostMapping("queryIsInShelf")
+    @GetMapping("queryIsInShelf")
     public ResultBean queryIsInShelf(Long bookId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
@@ -140,8 +128,8 @@ public class UserController extends BaseController {
     /**
      * 移出书架
      * */
-    @PostMapping("removeFromBookShelf")
-    public ResultBean removeFromBookShelf(Long bookId, HttpServletRequest request) {
+    @DeleteMapping("removeFromBookShelf/{bookId}")
+    public ResultBean removeFromBookShelf(@PathVariable("bookId") Long bookId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -153,7 +141,7 @@ public class UserController extends BaseController {
     /**
      * 分页查询书架
      * */
-    @PostMapping("listBookShelfByPage")
+    @GetMapping("listBookShelfByPage")
     public ResultBean listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
@@ -165,7 +153,7 @@ public class UserController extends BaseController {
     /**
      * 分页查询阅读记录
      * */
-    @PostMapping("listReadHistoryByPage")
+    @GetMapping("listReadHistoryByPage")
     public ResultBean listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
@@ -203,7 +191,7 @@ public class UserController extends BaseController {
     /**
      * 分页查询我的反馈列表
      * */
-    @PostMapping("listUserFeedBackByPage")
+    @GetMapping("listUserFeedBackByPage")
     public ResultBean listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
@@ -215,7 +203,7 @@ public class UserController extends BaseController {
     /**
      * 查询个人信息
      * */
-    @PostMapping("userInfo")
+    @GetMapping("userInfo")
     public ResultBean userInfo(HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
@@ -228,7 +216,7 @@ public class UserController extends BaseController {
      * 更新个人信息
      * */
     @PostMapping("updateUserInfo")
-    public ResultBean updateUserInfo(User user,HttpServletRequest request) {
+    public ResultBean updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -263,7 +251,7 @@ public class UserController extends BaseController {
     /**
      * 分页查询用户书评
      * */
-    @PostMapping("listCommentByPage")
+    @GetMapping("listCommentByPage")
     public ResultBean listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {

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

@@ -0,0 +1,25 @@
+package com.java2nb.novel.core.config;
+
+import org.springframework.boot.web.server.ErrorPage;
+import org.springframework.boot.web.server.ErrorPageRegistrar;
+import org.springframework.boot.web.server.ErrorPageRegistry;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+
+/**
+ * 错误页面配置
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class ErrorPageConfig implements ErrorPageRegistrar {
+
+    @Override
+    public void registerErrorPages(ErrorPageRegistry registry) {
+        /*1.错误类型为404，默认显示404.html网页*/
+        ErrorPage e404 = new ErrorPage(HttpStatus.NOT_FOUND, "/404.html");
+        /**
+        TODO 2.错误类型为500，表示服务器响应错误，默认显示/500.html网页
+        */
+        registry.addErrorPages(e404);
+    }
+}

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

@@ -86,7 +86,11 @@ public class JwtTokenUtil {
      */
     private boolean isTokenExpired(String token) {
         Date expiredDate = getExpiredDateFromToken(token);
-        return expiredDate.before(new Date());
+        if(expiredDate == null){
+            return true;
+        }else {
+            return expiredDate.before(new Date());
+        }
     }
 
     /**
@@ -94,7 +98,7 @@ public class JwtTokenUtil {
      */
     private Date getExpiredDateFromToken(String token) {
         Claims claims = getClaimsFromToken(token);
-        return claims.getExpiration();
+        return claims != null ? claims.getExpiration() : null;
     }
 
     /**

novel-front/src/main/java/com/java2nb/novel/form/UserForm.java

@@ -1,20 +0,0 @@
-package com.java2nb.novel.form;
-
-import lombok.Data;
-
-import javax.annotation.Generated;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-
-@Data
-public class UserForm {
-    @NotBlank(message="手机号不能为空！")
-    @Pattern(regexp="^1[3|4|5|6|7|8|9][0-9]{9}$",message="手机号格式不正确！")
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String username;
-
-    @NotBlank(message="密码不能为空！")
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String password;
-
-}

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

@@ -1,6 +1,6 @@
-package com.java2nb.novel.controller;
+package com.java2nb.novel.page;
 
-import com.java2nb.novel.core.bean.ResultBean;
+import com.java2nb.novel.controller.BaseController;
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.utils.ThreadLocalUtil;
 import com.java2nb.novel.entity.*;
@@ -9,16 +9,16 @@ import com.java2nb.novel.service.BookService;
 import com.java2nb.novel.service.NewsService;
 import com.java2nb.novel.service.UserService;
 import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.servlet.http.HttpServletRequest;
-import java.net.URLEncoder;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -27,7 +27,7 @@ import java.util.List;
 @Slf4j
 @RequiredArgsConstructor
 @Controller
-public class PageController extends BaseController{
+public class PageController extends BaseController {
 
     private final BookService bookService;
 
@@ -97,6 +97,7 @@ public class PageController extends BaseController{
     /**
      * 详情页
      * */
+    @SneakyThrows
     @RequestMapping("/book/{bookId}.html")
     public String bookDetail(@PathVariable("bookId") Long bookId, Model model) {
         Book book = bookService.queryBookDetail(bookId);
@@ -112,6 +113,7 @@ public class PageController extends BaseController{
     /**
      * 目录页
      * */
+    @SneakyThrows
     @RequestMapping("/book/indexList-{bookId}.html")
     public String indexList(@PathVariable("bookId") Long bookId, Model model) {
         Book book = bookService.queryBookDetail(bookId);
@@ -125,13 +127,14 @@ public class PageController extends BaseController{
     /**
      * 内容页
      * */
+    @SneakyThrows
     @RequestMapping("/book/{bookId}/{bookIndexId}.html")
-    public String indexList(@PathVariable("bookId") Long bookId,@PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request,Model model) {
+    public String indexList(@PathVariable("bookId") Long bookId,@PathVariable("bookIndexId") Long bookIndexId, HttpServletRequest request, Model model) {
         //查询书籍
         Book book = bookService.queryBookDetail(bookId);
-        model.addAttribute("book",book);
         //查询目录
         BookIndex bookIndex = bookService.queryBookIndex(bookIndexId);
+        model.addAttribute("book",book);
         model.addAttribute("bookIndex",bookIndex);
         //查询上一章节目录ID
         Long preBookIndexId = bookService.queryPreBookIndexId(bookId,bookIndex.getIndexNum());

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

@@ -3,7 +3,6 @@ package com.java2nb.novel.service;
 
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.entity.UserBuyRecord;
-import com.java2nb.novel.form.UserForm;
 import com.java2nb.novel.vo.BookReadHistoryVO;
 import com.java2nb.novel.vo.BookShelfVO;
 import com.java2nb.novel.entity.User;
@@ -19,17 +18,17 @@ public interface UserService {
 
     /**
      * 用户注册
-     * @param form 用户注册提交信息类
+     * @param user 用户注册信息类
      * @return jwt载体信息类
      * */
-    UserDetails register(UserForm form);
+    UserDetails register(User user);
 
     /**
      * 用户登陆
-     * @param form 用户登陆提交信息类
+     * @param user 用户登陆信息类
      * @return jwt载体信息类
      * */
-    UserDetails login(UserForm form);
+    UserDetails login(User user);
 
     /**
      * 查询小说是否已加入书架

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

@@ -5,7 +5,6 @@ import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.utils.BeanUtil;
 import com.java2nb.novel.entity.*;
 import com.java2nb.novel.entity.User;
-import com.java2nb.novel.form.UserForm;
 import com.java2nb.novel.service.UserService;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.exception.BusinessException;
@@ -29,7 +28,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 
-import static com.java2nb.novel.mapper.BookDynamicSqlSupport.book;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.id;
 import static com.java2nb.novel.mapper.UserBookshelfDynamicSqlSupport.userBookshelf;
 import static com.java2nb.novel.mapper.UserDynamicSqlSupport.*;
@@ -59,11 +57,11 @@ public class UserServiceImpl implements UserService {
 
 
     @Override
-    public UserDetails register(UserForm form) {
+    public UserDetails register(User user) {
         //查询用户名是否已注册
         SelectStatementProvider selectStatement = select(count(id))
-                .from(user)
-                .where(username, isEqualTo(form.getUsername()))
+                .from(UserDynamicSqlSupport.user)
+                .where(username, isEqualTo(user.getUsername()))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
         long count = userMapper.count(selectStatement);
@@ -72,7 +70,7 @@ public class UserServiceImpl implements UserService {
             throw new BusinessException(ResponseStatus.USERNAME_EXIST);
         }
         User entity = new User();
-        BeanUtils.copyProperties(form,entity);
+        BeanUtils.copyProperties(user,entity);
         //数据库生成注册记录
         Long id = new IdWorker().nextId();
         entity.setId(id);
@@ -91,12 +89,12 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public UserDetails login(UserForm form) {
+    public UserDetails login(User user) {
         //根据用户名密码查询记录
         SelectStatementProvider selectStatement = select(id, username,nickName)
-                .from(user)
-                .where(username, isEqualTo(form.getUsername()))
-                .and(password, isEqualTo(MD5Util.MD5Encode(form.getPassword(), Charsets.UTF_8.name())))
+                .from(UserDynamicSqlSupport.user)
+                .where(username, isEqualTo(user.getUsername()))
+                .and(password, isEqualTo(MD5Util.MD5Encode(user.getPassword(), Charsets.UTF_8.name())))
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
         List<User> users = userMapper.selectMany(selectStatement);
@@ -105,10 +103,10 @@ public class UserServiceImpl implements UserService {
         }
         //生成UserDetail对象并返回
         UserDetails userDetails = new UserDetails();
-        User user = users.get(0);
+        user = users.get(0);
         userDetails.setId(user.getId());
         userDetails.setNickName(user.getNickName());
-        userDetails.setUsername(form.getUsername());
+        userDetails.setUsername(user.getUsername());
         return userDetails;
     }
 
@@ -232,12 +230,9 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public void updateUserInfo(Long userId, User user) {
-        User updateUser = new User();
-        updateUser.setId(userId);
-        updateUser.setNickName(user.getNickName());
-        updateUser.setUserSex(user.getUserSex());
-        updateUser.setUpdateTime(new Date());
-        userMapper.updateByPrimaryKeySelective(updateUser);
+        user.setId(userId);
+        user.setUpdateTime(new Date());
+        userMapper.updateByPrimaryKeySelective(user);
 
     }
 

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

@@ -2,39 +2,13 @@ var SCYC = {
 }
 
 $.extend($.fn.validatebox.defaults.rules, {
-    checkBookName: {
-        validator: function (value, param) {
-            var url = "/aspx/book/booklist.aspx";
-            var data = { bid: param, bname: value, act: "getbooknamerepeat" };
-            var bool = false;
-            $.ajax({
-                type: "post",
-                dataType: 'html',
-                async: false,
-                url: url,
-                data: data,
-                cache: false,
-                success: function (result) {
-                    if (result == "1") {
-                        $.fn.validatebox.defaults.rules.checkBookName.message = '该书名已存在,请重新输入';
-                        bool = false;
-                    } else {
-                        $.fn.validatebox.defaults.rules.checkBookName.message = '';
-                        bool = true;
-                    }
-                }
-            });
-            return bool;
-            message: '';
-        }
-    },
-    checkNiceName: {
+    checkPenName: {
         validator: function (value, param) {
             var url = "/author/checkPenName";
             var data = { penName: value};
             var bool = false;
             $.ajax({
-                type: "post",
+                type: "get",
                 dataType: 'json',
                 async: false,
                 url: url,
@@ -42,10 +16,10 @@ $.extend($.fn.validatebox.defaults.rules, {
                 cache: false,
                 success: function (result) {
                     if (result.data) {
-                        $.fn.validatebox.defaults.rules.checkNiceName.message = '笔名已存在,请重新输入';
+                        $.fn.validatebox.defaults.rules.checkPenName.message = '笔名已存在,请重新输入';
                         bool = false;
                     } else {
-                        $.fn.validatebox.defaults.rules.checkNiceName.message = '';
+                        $.fn.validatebox.defaults.rules.checkPenName.message = '';
                         bool = true;
                     }
                 }

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

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Page Not Found</title>
+    <script>
+        setTimeout(function () {
+            location.href = '/';
+        },3000)
+
+    </script>
+</head>
+<body style="background: url(/images/404.jpeg) no-repeat;" >
+
+
+</body>
+</html>

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

@@ -56,7 +56,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/news/listByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -118,7 +118,7 @@
 
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/author/listIncomeMonthByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -124,7 +124,7 @@
         }
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/author/listIncomeDailyByPage",
             data: data,
             dataType: "json",

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

@@ -134,9 +134,9 @@
     }
 
     $.ajax({
-        type: "POST",
-        url: "/author/queryIndexContent",
-        data: {'indexId':indexId},
+        type: "get",
+        url: "/author/queryIndexContent/"+indexId,
+        data: {},
         dataType: "json",
         success: function (data) {
             if (data.code == 200) {

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

@@ -144,7 +144,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/author/listBookByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -144,7 +144,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/queryIndexList",
             data: {'bookId': bookId, 'curr': curr, 'limit': limit, 'orderBy': 'index_num desc'},
             dataType: "json",
@@ -299,9 +299,9 @@
 
             layer.close(index);
             $.ajax({
-                type: "POST",
-                url: "/author/deleteIndex",
-                data: {'indexId': indexId},
+                type: "delete",
+                url: "/author/deleteIndex/"+indexId,
+                data: {},
                 dataType: "json",
                 success: function (data) {
                     if (data.code == 200) {

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

@@ -60,7 +60,7 @@
                         作者笔名：
                     </td>
                     <td>
-                        <input name="penName" th:value="${author.penName}" type="text" maxlength="8" id="TxtNiceName" class="easyui-validatebox inpMain" data-options="required:true" validType="checkNiceName" />
+                        <input name="penName" th:value="${author.penName}" type="text" maxlength="8" id="TxtNiceName" class="easyui-validatebox inpMain" data-options="required:true" validType="checkPenName" />
 
                     </td>
                     <td>

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

@@ -119,7 +119,7 @@
     function searchComments(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listCommentByPage",
             data: {'bookId': $("#bookId").val(),'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -234,7 +234,7 @@
     }
     //查询是否在书架
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/queryIsInShelf",
         data: {'bookId':$("#bookId").val()},
         dataType: "json",

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

@@ -199,7 +199,7 @@
     var lastBookIndexId = $("#lastBookIndexId").val();
     if(lastBookIndexId){
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/queryBookIndexAbout",
             data: {'bookId': bookId, 'lastBookIndexId': lastBookIndexId},
             dataType: "json",
@@ -226,7 +226,7 @@
 <script language="javascript" type="text/javascript">
     //查询是否在书架
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/queryIsInShelf",
         data: {'bookId': $("#bookId").val()},
         dataType: "json",
@@ -255,7 +255,7 @@
 
     function loadCommentList(){
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listCommentByPage",
             data: {'bookId': $("#bookId").val()},
             dataType: "json",
@@ -335,7 +335,7 @@
     var bookCatId = $("#bookCatId").val();
     //查询同类推荐
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/book/listRecBookByCatId",
         data: {'catId': bookCatId},
         dataType: "json",

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

@@ -88,7 +88,7 @@
 
     function listRank(rankType){
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listRank",
             data: {'type':rankType,'limit':30},
             dataType: "json",

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

@@ -163,7 +163,7 @@
 
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/searchByPage",
             data: searchData,
             dataType: "json",
@@ -227,7 +227,7 @@
 
     function listBookCategory(c) {
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listBookCategory",
             data: {},
             dataType: "json",

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

@@ -2,7 +2,7 @@
     <div class="box_center cf">
         <div class="copyright">
             <ul >
-                <li class="menu"><a href="/?to=mobile">手机站</a><i class="line">|</i><a href="/">网站首页</a><i class="line">|</i><a href="/about/default.html" >关于我们</a><i class="line">|</i><a href="/about/contact.html" >联系我们</a><i class="line">|</i><a href="/user/feedback.html" >反馈留言</a><i class="line">|</i><a href="/author/index.html" >作家专区</a></li>
+                <li class="menu"><a href="/?to=mobile">手机站</a><i class="line">|</i><a href="/">网站首页</a><i class="line">|</i><a href="/about/default.html" >关于我们</a><i class="line">|</i><a href="/about/contact.html" >联系我们</a><i class="line">|</i><a href="/user/feedback.html" >反馈留言</a><i class="line">|</i><a href="/author/index.html" >作家专区</a><i class="line">|</i><a href="/mobile/fiction_house.apk" >客户端</a></li>
                 <li th:text="'Copyright (C) '+#{website.domain}+' All rights reserved&nbsp;&nbsp;'+#{website.name}+'版权所有'"></li>
 
             </ul>

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

@@ -157,7 +157,7 @@
     $(function () {
         //加载首页书籍设置数据
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listBookSetting",
             data: {},
             dataType: "json",
@@ -331,7 +331,7 @@
         })
         //首页新闻查询
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/news/listIndexNews",
             data: {},
             dataType: "json",
@@ -359,7 +359,7 @@
 
         //点击榜单数据查询
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listClickRank",
             data: {},
             dataType: "json",
@@ -402,7 +402,7 @@
         })
         //新书榜单查询
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listNewRank",
             data: {},
             dataType: "json",
@@ -446,7 +446,7 @@
         })
         //更新榜单查询
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/listUpdateRank",
             data: {},
             dataType: "json",
@@ -504,7 +504,7 @@
         })
         //友情链接查询
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/friendLink/listIndexLink",
             data: {},
             dataType: "json",

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

@@ -195,7 +195,7 @@
 <script>
     //查询是否在书架
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/queryIsInShelf",
         data: {'bookId': $("#bookIdHidden").val()},
         dataType: "json",
@@ -221,7 +221,7 @@
 
     //查询最新目录集合
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/book/queryNewIndexList",
         data: {'bookId': $("#bookIdHidden").val()},
         dataType: "json",

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

@@ -168,7 +168,7 @@
         }
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/book/searchByPage",
             data: searchData,
             dataType: "json",

novel-front/src/main/resources/templates/mobile/common/footer.html

@@ -4,7 +4,7 @@
     <a href="/?to=pc" style="font-size: 14px;color: #fff;margin-left: 8px">电脑站</a>
     <a href="/user/read_history.html" style="font-size: 14px;color: #fff;margin-left: 8px">阅读记录</a>
     <a href="/user/favorites.html" style="font-size: 14px;color: #fff;margin-left: 8px">书架</a>
-    <a href="/mobile/HotBook.apk" style="font-size: 14px;color: #fff;margin-left: 8px">客户端</a>
+    <a href="/mobile/fiction_house.apk" style="font-size: 14px;color: #fff;margin-left: 8px">客户端</a>
     <!--<a href="https://www.zinglizingli.xyz/me/index.html" style="font-size: 14px;color: #fff;margin-left: 8px">开发者</a>-->
 
 

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

@@ -91,7 +91,7 @@
             <dd><a href="/book/book_ranking.html?sortBy=visit_count&catId=7">女频小说</a></dd>
         </dl>
     </li>
-    <li class="layui-nav-item"><a href="javascript:toMyCollect()">书架</a></li>
+    <li class="layui-nav-item"><a href="/user/favorites.html">书架</a></li>
 
 </ul>
 <ul class="layui-nav pc" lay-filter="" style="padding:0 36px;text-align: center">
@@ -235,7 +235,7 @@
 <script>
     //加载首页书籍设置数据
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/book/listBookSetting",
         data: {},
         dataType: "json",
@@ -318,7 +318,7 @@
 
     //更新榜单查询
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/book/listUpdateRank",
         data: {},
         dataType: "json",

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

@@ -86,7 +86,7 @@
 
     //查询用户信息
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/userInfo",
         data: {},
         dataType: "json",

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

@@ -52,7 +52,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/user/listCommentByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -80,7 +80,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/user/listBookShelfByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -59,7 +59,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/user/listUserFeedBackByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -67,7 +67,7 @@
     function search(curr, limit) {
 
         $.ajax({
-            type: "POST",
+            type: "get",
             url: "/user/listReadHistoryByPage",
             data: {'curr':curr,'limit':limit},
             dataType: "json",

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

@@ -57,7 +57,7 @@
 <script type="text/javascript">
     //查询用户信息
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/userInfo",
         data: {},
         dataType: "json",

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

@@ -53,7 +53,7 @@
 <script type="text/javascript">
     //查询用户信息
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/userInfo",
         data: {},
         dataType: "json",

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

@@ -45,7 +45,7 @@
 <script type="text/javascript">
     //查询用户信息
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/userInfo",
         data: {},
         dataType: "json",

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

@@ -81,7 +81,7 @@
 <script type="text/javascript">
     //查询用户信息
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/userInfo",
         data: {},
         dataType: "json",
@@ -113,7 +113,7 @@
     })
     //查询书架列表
     $.ajax({
-        type: "POST",
+        type: "get",
         url: "/user/listBookShelfByPage",
         data: {'limit':2},
         dataType: "json",

pom.xml

@@ -5,11 +5,12 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>3.0.2</version>
+    <version>3.2.0</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>
         <module>novel-crawl</module>
+        <module>novel-admin</module>
     </modules>
     <packaging>pom</packaging>
 

sql/novel_plus.sql

@@ -491,13 +491,6 @@ CREATE TABLE `sys_dept` (
 -- ----------------------------
 -- Records of sys_dept
 -- ----------------------------
-INSERT INTO `sys_dept` VALUES ('6', '0', '研发部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('7', '6', '研發一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('8', '6', '研发二部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('9', '0', '销售部', '2', '1');
-INSERT INTO `sys_dept` VALUES ('10', '9', '销售一部', '1', '1');
-INSERT INTO `sys_dept` VALUES ('11', '0', '产品部', '3', '1');
-INSERT INTO `sys_dept` VALUES ('12', '11', '产品一部', '1', '1');
 INSERT INTO `sys_dept` VALUES ('13', '0', '测试部', '5', '1');
 INSERT INTO `sys_dept` VALUES ('14', '13', '测试一部', '1', '1');
 INSERT INTO `sys_dept` VALUES ('15', '13', '测试二部', '2', '1');
@@ -894,52 +887,6 @@ CREATE TABLE `sys_log` (
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1412 DEFAULT CHARSET=utf8 COMMENT='系统日志';
 
--- ----------------------------
--- Records of sys_log
--- ----------------------------
-INSERT INTO `sys_log` VALUES ('1369', '-1', '获取用户信息为空', '登录', '462', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:21');
-INSERT INTO `sys_log` VALUES ('1370', '-1', '获取用户信息为空', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:26');
-INSERT INTO `sys_log` VALUES ('1371', '1', 'admin', '登录', '98', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1372', '1', 'admin', '请求访问主页', '372', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:09:33');
-INSERT INTO `sys_log` VALUES ('1373', '1', 'admin', '请求访问主页', '28', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:12:41');
-INSERT INTO `sys_log` VALUES ('1374', '1', 'admin', '编辑角色', '11', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:18:42');
-INSERT INTO `sys_log` VALUES ('1375', '1', 'admin', '添加菜单', '2', 'com.java2nb.system.controller.MenuController.add()', null, '127.0.0.1', '2020-05-13 11:19:55');
-INSERT INTO `sys_log` VALUES ('1376', '1', 'admin', '保存菜单', '225', 'com.java2nb.system.controller.MenuController.save()', null, '127.0.0.1', '2020-05-13 11:24:42');
-INSERT INTO `sys_log` VALUES ('1377', '1', 'admin', '编辑菜单', '15', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:54');
-INSERT INTO `sys_log` VALUES ('1378', '1', 'admin', '编辑菜单', '11', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:24:58');
-INSERT INTO `sys_log` VALUES ('1379', '1', 'admin', '更新菜单', '241', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:12');
-INSERT INTO `sys_log` VALUES ('1380', '1', 'admin', '编辑菜单', '8', 'com.java2nb.system.controller.MenuController.edit()', null, '127.0.0.1', '2020-05-13 11:25:16');
-INSERT INTO `sys_log` VALUES ('1381', '1', 'admin', '更新菜单', '199', 'com.java2nb.system.controller.MenuController.update()', null, '127.0.0.1', '2020-05-13 11:25:26');
-INSERT INTO `sys_log` VALUES ('1382', '1', 'admin', '编辑角色', '13', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:26:11');
-INSERT INTO `sys_log` VALUES ('1383', '1', 'admin', '更新角色', '931', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:26:36');
-INSERT INTO `sys_log` VALUES ('1384', '-1', '获取用户信息为空', '登录', '11', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:02');
-INSERT INTO `sys_log` VALUES ('1385', '1', 'admin', '登录', '19', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1386', '1', 'admin', '请求访问主页', '27', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:08');
-INSERT INTO `sys_log` VALUES ('1387', '1', 'admin', '登录', '272', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1388', '1', 'admin', '请求访问主页', '109', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:27:56');
-INSERT INTO `sys_log` VALUES ('1389', '1', 'admin', '编辑角色', '8', 'com.java2nb.system.controller.RoleController.edit()', null, '127.0.0.1', '2020-05-13 11:30:36');
-INSERT INTO `sys_log` VALUES ('1390', '1', 'admin', '更新角色', '567', 'com.java2nb.system.controller.RoleController.update()', null, '127.0.0.1', '2020-05-13 11:30:42');
-INSERT INTO `sys_log` VALUES ('1391', '-1', '获取用户信息为空', '登录', '246', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:38');
-INSERT INTO `sys_log` VALUES ('1392', '1', 'admin', '登录', '38', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:31:42');
-INSERT INTO `sys_log` VALUES ('1393', '1', 'admin', '请求访问主页', '110', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:31:43');
-INSERT INTO `sys_log` VALUES ('1394', '1', 'admin', 'error', null, 'http://127.0.0.1/test/order/list', 'org.springframework.jdbc.BadSqlGrammarException: \r\n### Error querying database.  Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\r\n### The error may exist in file [E:\\baseprojectparent\\novel-plus\\novel-admin\\target\\classes\\mybatis\\test\\OrderMapper.xml]\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order                                      order by id desc             limit ?, ?\r\n### Cause: java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist\n; bad SQL grammar []; nested exception is java.sql.SQLSyntaxErrorException: Table \'novel_plus.fb_order\' doesn\'t exist', null, '2020-05-13 11:33:27');
-INSERT INTO `sys_log` VALUES ('1395', '1', 'admin', '登录', '276', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1396', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:39:20');
-INSERT INTO `sys_log` VALUES ('1397', '1', 'admin', '登录', '285', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1398', '1', 'admin', '请求访问主页', '90', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:47:00');
-INSERT INTO `sys_log` VALUES ('1399', '1', 'admin', '登录', '251', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1400', '1', 'admin', '请求访问主页', '95', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 11:48:28');
-INSERT INTO `sys_log` VALUES ('1401', '1', 'admin', '登录', '302', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:09:33');
-INSERT INTO `sys_log` VALUES ('1402', '1', 'admin', '请求访问主页', '88', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:09:34');
-INSERT INTO `sys_log` VALUES ('1403', '1', 'admin', '请求更改用户密码', '3', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:11:49');
-INSERT INTO `sys_log` VALUES ('1404', '1', 'admin', 'admin提交更改用户密码', '140', 'com.java2nb.system.controller.UserController.adminResetPwd()', null, '127.0.0.1', '2020-05-13 14:11:50');
-INSERT INTO `sys_log` VALUES ('1405', '1', 'admin', '请求更改用户密码', '4', 'com.java2nb.system.controller.UserController.resetPwd()', null, '127.0.0.1', '2020-05-13 14:12:11');
-INSERT INTO `sys_log` VALUES ('1406', '1', 'admin', '登录', '275', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:14:26');
-INSERT INTO `sys_log` VALUES ('1407', '1', 'admin', '请求访问主页', '73', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:14:27');
-INSERT INTO `sys_log` VALUES ('1408', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:38');
-INSERT INTO `sys_log` VALUES ('1409', '1', 'admin', 'error', null, 'http://127.0.0.1/novel/author/update', 'org.springframework.validation.BindException: org.springframework.validation.BeanPropertyBindingResult: 1 errors\nField error in object \'authorDO\' on field \'id\': rejected value [1,1]; codes [typeMismatch.authorDO.id,typeMismatch.id,typeMismatch.java.lang.Long,typeMismatch]; arguments [org.springframework.context.support.DefaultMessageSourceResolvable: codes [authorDO.id,id]; arguments []; default message [id]]; default message [Failed to convert property value of type \'java.lang.String\' to required type \'java.lang.Long\' for property \'id\'; nested exception is java.lang.NumberFormatException: For input string: \"1,1\"]', null, '2020-05-13 14:14:47');
-INSERT INTO `sys_log` VALUES ('1410', '1', 'admin', '登录', '261', 'com.java2nb.system.controller.LoginController.ajaxLogin()', null, '127.0.0.1', '2020-05-13 14:18:07');
-INSERT INTO `sys_log` VALUES ('1411', '1', 'admin', '请求访问主页', '83', 'com.java2nb.system.controller.LoginController.index()', null, '127.0.0.1', '2020-05-13 14:18:07');
 
 -- ----------------------------
 -- Table structure for sys_menu
@@ -1047,9 +994,6 @@ CREATE TABLE `sys_role` (
 -- Records of sys_role
 -- ----------------------------
 INSERT INTO `sys_role` VALUES ('1', '超级用户角色', 'admin', '拥有最高权限', '2', '2017-08-12 00:43:52', '2017-08-12 19:14:59');
-INSERT INTO `sys_role` VALUES ('59', '普通用户', null, '基本用户权限', null, null, null);
-INSERT INTO `sys_role` VALUES ('60', '测试', null, '<div>', null, null, null);
-INSERT INTO `sys_role` VALUES ('61', 'test', null, '测试', null, null, null);
 
 -- ----------------------------
 -- Table structure for sys_role_data_perm
@@ -1497,19 +1441,7 @@ CREATE TABLE `sys_user` (
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd633268afedf209e1e4ea0f5f43228a8', '6', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '148', 'ccc', '122;121;', '北京市', '北京市市辖区', '东城区');
-INSERT INTO `sys_user` VALUES ('2', 'test', '临时用户', 'd0af8fa1272ef5a152d9e27763eea293', '6', 'test@bootdo.com', null, '1', '1', '2017-08-14 13:43:05', '2017-08-14 21:15:36', null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('36', 'ldh', '刘德华', 'bfd9394475754fbe45866eba97738c36', '7', 'ldh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('123', 'zxy', '张学友', '35174ba93f5fe7267f1fb3c1bf903781', '6', 'zxy@bootdo', null, '0', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('124', 'wyf', '吴亦凡', 'e179e6f687bbd57b9d7efc4746c8090a', '6', 'wyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('130', 'lh', '鹿晗', '7924710cd673f68967cde70e188bb097', '9', 'lh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('131', 'lhc', '令狐冲', 'd515538e17ecb570ba40344b5618f5d4', '6', 'lhc@bootdo.com', null, '0', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('132', 'lyf', '刘亦菲', '7fdb1d9008f45950c1620ba0864e5fbd', '13', 'lyf@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('134', 'lyh', '李彦宏', 'dc26092b3244d9d432863f2738180e19', '8', 'lyh@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('135', 'wjl', '王健林', '3967697dfced162cf6a34080259b83aa', '6', 'wjl@bootod.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('136', 'gdg', '郭德纲', '3bb1bda86bc02bf6478cd91e42135d2f', '9', 'gdg@bootdo.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('137', 'test2', 'test2', '649169898e69272c0e5bc899baf1e904', null, '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
-INSERT INTO `sys_user` VALUES ('138', 'test3', 'test3', '79ba2d0b58d8a2e94f6b18744c8cd280', '16', '1179705413@qq.com', null, '1', null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO `sys_user` VALUES ('1', 'admin', '超级管理员', 'd633268afedf209e1e4ea0f5f43228a8', '14', 'admin@example.com', '17699999999', '1', '1', '2017-08-15 21:40:39', '2017-08-15 21:41:00', '96', '2017-12-14 00:00:00', '148', 'ccc', '122;121;', '北京市', '北京市市辖区', '东城区');
 
 -- ----------------------------
 -- Table structure for sys_user_role