fix: 书架列表时间格式化

沙箱环境自动升级到新版后，没有在代码中更换新版本的应用/网关/账号信息，也没有从左边栏沙箱工具中下载最新版本的沙箱支付宝APP安装使用。

.gitignore

@@ -1,12 +1,7 @@
-/.idea
-/cachedata
-/logs
-/novel-common/target
-/novel-front/target
-/novel-front/*.iml
-/novel-common/*.iml
-/novel-mobile/target
-/novel-mobile/*.iml
-/novel-front/novel-front.iml
-/novel-crawl/novel-crawl.iml
-/novel-crawl/target
+**/logs
+**/.idea
+**/cachedata
+**/target
+**/*.iml
+**/.DS_Store
+

README.md

@@ -1,134 +1,95 @@
-[![index](./assets/热门云产品1040.100.jpg)](https://cloud.tencent.com/act/cps/redirect?redirect=1052&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console)
+[![index]( https://youdoc.github.io/img/tencent.jpg )]( https://cloud.tencent.com/act/cps/redirect?redirect=2446&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console )
 
-# 小说精品屋-plus
+<p align="center">
+    <a href='https://github.com/201206030/novel-plus'><img alt="Github stars" src="https://img.shields.io/github/stars/201206030/novel-plus?logo=github"></a>
+    <a href='https://github.com/201206030/novel-plus'><img alt="Github forks" src="https://img.shields.io/github/forks/201206030/novel-plus?logo=github"></a>
+    <a href='https://gitee.com/novel_dev_team/novel-plus'><img alt="Gitee stars" src="https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=gitee"></a>
+    <a href='https://gitee.com/novel_dev_team/novel-plus'><img alt="Gitee forks" src="https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=gitee"></a>
+    <a href="https://github.com/201206030/novel-plus"><img src="https://visitor-badge.glitch.me/badge?page_id=201206030.novel-plus" alt="visitors"></a>
+</p>
 
-#### 前言
+<p align="center">
+      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='https://www.bilibili.com/video/BV1Zo4y187Mi'>项目演示</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/1.html'>安装教程</a>
+</p> 
 
-小说精品屋-plus致力于打造一个完整的商用小说门户平台。
+## 项目介绍
 
-#### 项目介绍
+novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
+系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、会员充值、订阅模式、新闻发布和实时统计报表。
 
-[小说精品屋](https://github.com/201206030/fiction_house)是一个多平台（web、安卓app、微信小程序）、功能完善的小说弹幕网站，包含精品小说专区、轻小说专区和漫画专区。包括小说/漫画分类、小说/漫画搜索、小说/漫画排行、完本小说/漫画、小说/漫画评分、小说/漫画在线阅读、小说/漫画书架、小说/漫画阅读记录、小说下载、小说弹幕、小说/漫画自动爬取、小说内容自动分享到微博、邮件自动推广、链接自动推送到百度搜索引擎等功能。包含电脑端、移动端、微信小程序等多个平台，现已开源web端、安卓端、小程序端源码。 
+## 项目地址
 
-小说精品屋-plus是在小说精品屋的基础上，重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
+- 学习版：[GitHub](https://github.com/201206030/novel) ｜ [码云](https://gitee.com/novel_dev_team/novel)
+  ｜ [保姆级教程](https://docs.xxyopen.com)
+- **应用版**：[GitHub](https://github.com/201206030/novel-plus) ｜ [码云](https://gitee.com/novel_dev_team/novel-plus)
+- 微服务版：[GitHub](https://github.com/201206030/novel-cloud) ｜ [码云](https://gitee.com/novel_dev_team/novel-cloud)
 
-- [x] 数据库重新设计，结构调整。
-- [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
-- [x] 移动站与PC站站点分离，浏览器自动识别跳转。
-- [x] PC站UI更新。
-- [x] 新闻模块。
-- [x] 排行榜。
-- [x] 小说评论模块。
-- [x] 阅读主题模块。
-- [ ] 作家专区。
-- [ ] 充值。
-- [ ] 后台管理系统。
-- [x] 爬虫管理系统。
-
-#### 项目结构
+## 项目结构
 
 ```
 novel-plus -- 父工程
 ├── novel-common -- 通用模块
-├── novel-front -- 前台门户系统
-├── novel-crawl -- 爬虫管理系统
-└── novel-admin -- 后台管理系统
+├── novel-front -- 前台门户&作家后台
+├── novel-crawl -- 爬虫
+├── novel-admin -- 管理后台
+└── templates -- 前端模版
 ```
 
-#### 技术选型
-Springboot+Mybatis+Mysql+Ehcache+Thymeleaf+Layui
+## 技术选型
 
-#### PC站截图
+| 技术                  | 说明
+|---------------------| ---------------------------
+| Spring Boot         | Spring 应用快速开发脚手架
+| MyBatis             | 持久层 ORM 框架
+| MyBatis Dynamic SQL | Mybatis 动态 sql
+| PageHelper          | MyBatis 分页插件
+| MyBatis Generator    | 持久层代码生成插件
+| Sharding-JDBC       | 代码层分库分表中间件
+| JJWT                | JWT 登录支持
+| Spring Security      | 安全框架
+| Apache Shiro               | 安全框架
+| Redis               | 缓存方案
+| Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案）
+| Lombok              | 简化对象封装工具
+| Docker              | 应用容器引擎
+| MySQL               | 数据库服务
+| Thymeleaf           | 模板引擎
+| Layui               | 前端 UI 框架
 
+## 项目截图
 
+### 绿色主题模版
 
-![index](./assets/1588548668698.gif)
+[![点击查看大图](https://youdoc.gitee.io/resource/images/os/novel-plus/green.png)](https://youdoc.gitee.io/resource/images/os/novel-plus/green.png)
+[![点击查看大图](https://youdoc.gitee.io/resource/images/os/novel-plus/green3.png)](https://youdoc.gitee.io/resource/images/os/novel-plus/green3.png)
+[![点击查看大图](https://youdoc.gitee.io/resource/images/os/novel-plus/green2.png)](https://youdoc.gitee.io/resource/images/os/novel-plus/green2.png)
 
+## 演示视频
 
+https://www.bilibili.com/video/BV1Zo4y187Mi
 
-![index](./assets/1588548784395.gif)
+## 增值服务
 
+👉 [了解详情](https://novel.xxyopen.com/service.htm)
 
+## 微信公众号
 
-![index](./assets/1588548916980.gif)
+发布最新更新动态、最新前端模版、最新爬虫规则、文档教程等。
 
+![](https://youdoc.github.io/img/qrcode_for_gh.jpg)
 
+## 赞赏支持
 
-#### 手机站截图
+开源项目不易，若此项目能得到你的青睐，那么你可以赞赏支持作者持续开发与维护。
 
-1. 首页
+- 服务器的费用也是一笔开销
+- 编写更完备的文档教程
+- 发布更多前端模版和爬虫规则
+- 一杯咖啡
 
-   ![index](./assets/QQ%E5%9B%BE%E7%89%8720191018162208.jpg)
+![](https://s1.ax1x.com/2020/10/31/BUQJwq.png)
 
-   
+## 免责声明
 
-2. 小说详情页
-
-   ![微信图片_20190904181558](./assets/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190904181558.png)
-
-   
-
-3. 目录页
-
-   ![QQ图片20191018161901](./assets/QQ%E5%9B%BE%E7%89%8720191108022250.png)
-
-4. 小说阅读页
-
-   ![QQ图片20191018161901](./assets/QQ%E5%9B%BE%E7%89%8720191018161901.png)
-
-   
-
-#### 爬虫管理系统截图
-
-![QQ图片20191018161901](./assets/crawl_index.png)
-
-
-
-#### 安装步骤
-
-##### 数据库安装：
-
-1. 安装MySQL软件。
-2. 修改MySQL`max_allowed_packet `配置（建议100M）。
-3. 新建数据库，设置编码为utf8mb4。
-4. 执行sql/novel_plus.sql脚本文件。
-
-##### 爬虫管理系统安装：
-
-1.  修改novel-common模块下application-dev.yml文件中的数据库的配置。
-2. 修改novel-crawl模块下application.yml文件中的管理员账号密码。
-3. 启动程序，打开浏览器，默认8081端口访问。
-4. 选择已有或新增爬虫源（支持自定义爬虫规则），点击`开启`按钮，开始爬取小说数据。
-
-##### 前台小说门户安装：
-
-1. 修改novel-common模块下application-dev.yml文件中的数据库的配置。
-2. 启动程序，打开浏览器，默认8080端口访问。
-
-**喜欢此项目的可以给我的GitHub和Gitee加个Star支持一下 。**
-
-#### 演示地址
-
-[点击前往](http://www.java2nb.com)（前台门户）
-
-#### 代码仓库
-
- Gitee仓库地址： https://gitee.com/xiongxyang/novel-plus
-
- GitHub仓库地址： https://github.com/201206030/novel-plus 
-
-#### QQ交流群
-
-![mini-code](./assets/qq_group.png)
-
-#### 捐赠支持
-
-开源项目不易，若此项目能得到你的青睐，可以捐赠支持作者持续开发与维护。 
-
-![mini-code](./assets/jk.png)
-
-#### 备注
-
-精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
-
-[![index](./assets/120060.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )
+本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。

doc/es/book.http

@@ -0,0 +1,82 @@
+PUT /novel
+{
+  "mappings" : {
+    "book" : {
+      "properties" : {
+        "id" : {
+          "type" : "long"
+        },
+        "authorId" : {
+          "type" : "long"
+        },
+        "authorName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 1.9
+        },
+
+        "bookName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 2
+        },
+
+        "bookDesc" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 0.1
+        },
+
+        "bookStatus" : {
+          "type" : "short"
+        },
+
+        "catId" : {
+          "type" : "integer"
+        },
+
+        "catName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 1.0
+        },
+
+        "lastIndexId" : {
+          "type" : "long"
+        },
+
+        "lastIndexName" : {
+          "type" : "text",
+          "analyzer": "ik_smart",
+          "boost": 0.1
+        },
+
+        "lastIndexUpdateTime" : {
+          "type": "keyword"
+        },
+
+        "picUrl" : {
+          "type" : "keyword"
+        },
+
+        "score" : {
+          "type" : "float"
+        },
+
+        "wordCount" : {
+          "type" : "integer"
+        },
+
+        "workDirection" : {
+          "type" : "short"
+        },
+
+        "visitCount" : {
+          "type": "long"
+        }
+
+
+      }
+    }
+  }
+}

doc/sql/20200511.sql

@@ -0,0 +1,33 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : localhost
+Source Server Version : 50725
+Source Host           : localhost:3306
+Source Database       : novel_plus
+
+Target Server Type    : MYSQL
+Target Server Version : 50725
+File Encoding         : 65001
+
+Date: 2020-05-11 17:56:23
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for order_pay
+-- ----------------------------
+DROP TABLE IF EXISTS `order_pay`;
+CREATE TABLE `order_pay` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `out_trade_no` bigint(20) NOT NULL COMMENT '商户订单号',
+  `trade_no` varchar(64) DEFAULT NULL COMMENT '支付宝/微信交易号',
+  `pay_channel` tinyint(1) NOT NULL DEFAULT '1' COMMENT '支付渠道，1：支付宝，2：微信',
+  `total_amount` int(11) NOT NULL COMMENT '交易金额(单位元)',
+  `user_id` bigint(20) NOT NULL COMMENT '支付用户ID',
+  `pay_status` tinyint(1) DEFAULT '2' COMMENT '支付状态：0：支付失败，1：支付成功，2：待支付',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COMMENT='充值订单';

doc/sql/20200513.sql

@@ -0,0 +1,87 @@
+/*
+Navicat MySQL Data Transfer
+
+Source Server         : localhost
+Source Server Version : 50624
+Source Host           : localhost:3306
+Source Database       : novel_plus
+
+Target Server Type    : MYSQL
+Target Server Version : 50624
+File Encoding         : 65001
+
+Date: 2020-05-13 21:42:20
+*/
+
+SET FOREIGN_KEY_CHECKS=0;
+
+-- ----------------------------
+-- Table structure for author
+-- ----------------------------
+DROP TABLE IF EXISTS `author`;
+CREATE TABLE `author` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
+  `invite_code` varchar(20) DEFAULT NULL COMMENT '邀请码',
+  `pen_name` varchar(20) DEFAULT NULL COMMENT '笔名',
+  `tel_phone` varchar(20) DEFAULT NULL COMMENT '手机号码',
+  `chat_account` varchar(50) DEFAULT NULL COMMENT 'QQ或微信账号',
+  `email` varchar(50) DEFAULT NULL COMMENT '电子邮箱',
+  `work_direction` tinyint(4) DEFAULT NULL COMMENT '作品方向，0：男频，1：女频',
+  `status` tinyint(4) DEFAULT '0' COMMENT '0：正常，1：封禁',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='作者表';
+
+-- ----------------------------
+-- Records of author
+-- ----------------------------
+INSERT INTO `author` VALUES ('1', null, 'reerer', 'abc', '13560487656', '23484388', '23484388@qq.com', '0', '0', null);
+INSERT INTO `author` VALUES ('2', '1255060328322027520', 'rwrr445554', '梦入神机', '13560421324', '1179705413', 'reerer@qq.com', '0', '0', '2020-05-13 14:01:31');
+
+-- ----------------------------
+-- Table structure for author_code
+-- ----------------------------
+DROP TABLE IF EXISTS `author_code`;
+CREATE TABLE `author_code` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `invite_code` varchar(100) DEFAULT NULL COMMENT '邀请码',
+  `validity_time` datetime DEFAULT NULL COMMENT '有效时间',
+  `is_use` tinyint(1) DEFAULT '0' COMMENT '是否使用过，0：未使用，1:使用过',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `create_user_id` bigint(20) DEFAULT NULL COMMENT '创建人ID',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_code` (`invite_code`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='作家邀请码表';
+
+-- ----------------------------
+-- Records of author_code
+-- ----------------------------
+INSERT INTO `author_code` VALUES ('3', 'reerer', '2020-05-27 22:43:45', '1', '2020-05-13 11:40:56', '1');
+INSERT INTO `author_code` VALUES ('4', '123456', '2020-05-28 00:00:00', '0', '2020-05-13 14:09:55', '1');
+INSERT INTO `author_code` VALUES ('5', 'ww34343', '2020-05-21 00:00:00', '0', '2020-05-13 14:18:58', '1');
+
+
+
+-- ----------------------------
+-- Table structure for user_buy_record
+-- ----------------------------
+DROP TABLE IF EXISTS `user_buy_record`;
+CREATE TABLE `user_buy_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `book_id` bigint(20) DEFAULT NULL COMMENT '购买的小说ID',
+  `book_name` varchar(50) DEFAULT NULL COMMENT '购买的小说名',
+  `book_index_id` bigint(20) DEFAULT NULL COMMENT '购买的章节ID',
+  `book_index_name` varchar(100) DEFAULT NULL COMMENT '购买的章节名',
+  `buy_amount` int(11) DEFAULT NULL COMMENT '购买使用的屋币数量',
+  `create_time` datetime DEFAULT NULL COMMENT '购买时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `key_userId_indexId` (`user_id`,`book_index_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='用户消费记录表';
+
+-- ----------------------------
+-- Records of user_buy_record
+-- ----------------------------
+INSERT INTO `user_buy_record` VALUES ('1', '1255060328322027520', '1260400284744613890', '我是一只消消乐2', '1260522024606953472', '第三章', '10', '2020-05-13 21:29:09');
+INSERT INTO `user_buy_record` VALUES ('2', '1255060328322027520', '1260400284744613890', '我是一只消消乐2', '1260564410687107072', '第四章', '10', '2020-05-13 21:40:38');

doc/sql/20200518.sql

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

doc/sql/20200608.sql

@@ -0,0 +1,2 @@
+INSERT INTO `crawl_source` (`id`, `source_name`, `crawl_rule`, `source_status`, `create_time`, `update_time`) VALUES
+(6, '新笔趣阁', '{\n	\"bookListUrl\": \"http://www.xbiquge.la/fenlei/{catId}_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"6\",\n		\"catId6\": \"5\"\n	},\n	\"bookIdPatten\": \"<a\\\\s+href=\\\"http://www.xbiquge.la/(\\\\d+/\\\\d+)/\\\"\\\\s+target=\\\"_blank\\\">\",\n	\"pagePatten\": \"<em\\\\s+id=\\\"pagestats\\\">(\\\\d+)/\\\\d+</em>\",\n	\"totalPagePatten\": \"<em\\\\s+id=\\\"pagestats\\\">\\\\d+/(\\\\d+)</em>\",\n	\"bookDetailUrl\": \"http://www.xbiquge.la/{bookId}/\",\n	\"bookNamePatten\": \"<h1>([^/]+)</h1>\",\n	\"authorNamePatten\": \"者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.xbiquge.la/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"bookStatusRule\": {},\n	\"descStart\": \"<div id=\\\"intro\\\">\",\n	\"descEnd\": \"</div>\",\n	\"upadateTimePatten\": \"<p>最后更新：(\\\\d+-\\\\d+-\\\\d+\\\\s\\\\d+:\\\\d+:\\\\d+)</p>\",\n	\"upadateTimeFormatPatten\": \"yyyy-MM-dd HH:mm:ss\",\n	\"bookIndexUrl\": \"http://www.xbiquge.la/{bookId}/\",\n	\"indexIdPatten\": \"<a\\\\s+href=\'/\\\\d+/\\\\d+/(\\\\d+)\\\\.html\'\\\\s+>[^/]+</a>\",\n	\"indexNamePatten\": \"<a\\\\s+href=\'/\\\\d+/\\\\d+/\\\\d+\\\\.html\'\\\\s+>([^/]+)</a>\",\n	\"bookContentUrl\": \"http://www.xbiquge.la/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\">\",\n	\"contentEnd\": \"<p>\"\n}', 0, '2020-05-23 22:46:58', '2020-05-23 22:46:58');

doc/sql/20200615.sql

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

doc/sql/20201103.sql

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

doc/sql/20201109.sql

@@ -0,0 +1 @@
+alter table book add column `yesterday_buy` int(11) DEFAULT '0' COMMENT '昨日订阅数' after comment_count;

doc/sql/20201122.sql

@@ -0,0 +1 @@
+alter table book_index add column `book_price` int(3) DEFAULT 0 COMMENT '章节费用（屋币）' after `is_vip`;

doc/sql/20201201.sql

@@ -0,0 +1,32 @@
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (246, 241, '批量删除', NULL, 'novel:news:batchRemove', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (245, 241, '删除', NULL, 'novel:news:remove', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (244, 241, '修改', NULL, 'novel:news:edit', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (243, 241, '新增', NULL, 'novel:news:add', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (242, 241, '查看', NULL, 'novel:news:detail', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (241, 234, '新闻列表', 'novel/news', 'novel:news:news', 1, 'fa', 8, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (240, 235, '批量删除', NULL, 'novel:category:batchRemove', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (239, 235, '删除', NULL, 'novel:category:remove', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (238, 235, '修改', NULL, 'novel:category:edit', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (237, 235, '新增', NULL, 'novel:category:add', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (236, 235, '查看', NULL, 'novel:category:detail', 2, NULL, 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (235, 234, '类别管理', 'novel/category', 'novel:category:category', 1, 'fa', 6, NULL, NULL);
+INSERT INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`, `gmt_create`, `gmt_modified`) VALUES (234, 0, '新闻管理', '', '', 0, 'fa fa-newspaper-o', 8, NULL, NULL);
+
+
+
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4889, 1, 246);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4890, 1, 245);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4891, 1, 244);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4892, 1, 243);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4893, 1, 242);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4899, 1, 241);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4894, 1, 240);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4895, 1, 239);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4896, 1, 238);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4897, 1, 237);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4898, 1, 236);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4900, 1, 235);
+INSERT INTO `sys_role_menu`(`id`, `role_id`, `menu_id`) VALUES (4888, 1, 234);
+
+
+delete from sys_menu where menu_id = 202;

doc/sql/20210726.sql

@@ -0,0 +1 @@
+alter table news add column `read_count` BIGINT NOT NULL DEFAULT '0' COMMENT '阅读量' after content;

doc/sql/20210913.sql

@@ -0,0 +1,3 @@
+alter table book_index add column storage_type varchar(10) NOT NULL DEFAULT 'db' COMMENT '存储方式' after book_price ;
+
+

doc/sql/20230413.sql

@@ -0,0 +1,121 @@
+CREATE TABLE `website_info`
+(
+    id             bigint(20)   NOT NULL AUTO_INCREMENT COMMENT '主键',
+    name           varchar(50)  NOT NULL COMMENT '网站名',
+    domain         varchar(50)  NOT NULL COMMENT '网站域名',
+    keyword        varchar(50)  NOT NULL COMMENT 'SEO关键词',
+    description    varchar(512) NOT NULL COMMENT '网站描述',
+    qq             varchar(20)  NOT NULL COMMENT '站长QQ',
+    logo           varchar(200) NOT NULL COMMENT '网站logo图片（默认）',
+    logo_dark      varchar(200) NOT NULL COMMENT '网站logo图片（深色）',
+    create_time    datetime     null comment '创建时间',
+    create_user_id bigint       null comment '创建人ID',
+    update_time    datetime     null comment '更新时间',
+    update_user_id bigint       null comment '更新人ID',
+    PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='网站信息表';
+
+INSERT INTO website_info (id, name, domain, keyword, description, qq, logo, logo_dark, create_time, create_user_id,
+                          update_time, update_user_id)
+VALUES (1, '小说精品屋', 'www.xxyopen.com', '小说精品屋,小说,小说CMS,原创文学系统,开源小说系统,免费小说建站程序',
+        '小说精品屋是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能，新书自动入库，老书自动更新。',
+        '1179705413', 'https://youdoc.gitee.io/resource/images/logo/logo.png',
+        'https://youdoc.gitee.io/resource/images/logo/logo_white.png', null, null, null, null);
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (300, 0, '网站管理', '', '', 0, 'fa fa-television', 6, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (301, 300, '网站信息', 'novel/websiteInfo', 'novel:websiteInfo:websiteInfo', '1', 'fa', '6');
+
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 300);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 301);
+
+
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (310, 300, '友情链接', 'novel/friendLink', 'novel:friendLink:friendLink', '1', 'fa', '16');
+
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (311, 310, '查看', null, 'novel:friendLink:detail', '2', null, '6');
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (312, 310, '新增', null, 'novel:friendLink:add', '2', null, '6');
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (313, 310, '修改', null, 'novel:friendLink:edit', '2', null, '6');
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (314, 310, '删除', null, 'novel:friendLink:remove', '2', null, '6');
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (315, 310, '批量删除', null, 'novel:friendLink:batchRemove', '2', null, '6');
+
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 310);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 311);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 312);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 313);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 314);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 315);
+
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (400, 0, '会员管理', '', '', 0, 'fa fa-vcard', 9, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (401, 400, '会员列表', 'novel/user', 'novel:user:user', '1', 'fa', '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 400);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 401);
+
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (500, 0, '订单管理', '', '', 0, 'fa fa-money', 19, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (501, 500, '订单列表', 'novel/pay', 'novel:pay:pay', '1', 'fa', '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 500);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 501);
+
+
+INSERT INTO sys_menu (menu_id, parent_id, name, url, perms, type, icon, order_num, gmt_create, gmt_modified)
+VALUES (600, 0, '小说管理', '', '', 0, 'fa fa-book', 15, null, null);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (601, 600, '小说列表', 'novel/book', 'novel:book:book', '1', 'fa', '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 600);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 601);
+
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (602, 601, '删除', null, 'novel:book:remove', '2', null, '6');
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 602);
+
+INSERT
+INTO `sys_menu`(`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (603, 600, '评论管理', 'novel/bookComment', 'novel:bookComment:bookComment', '1', 'fa', '10');
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 603);
+
+INSERT INTO `sys_menu` (menu_id, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (604, 603, '删除', null, 'novel:bookComment:remove', '2', null, '6');
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 604);

doc/sql/20230418.sql

@@ -0,0 +1,51 @@
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('轮播图', '0', 'book_rec_type', '小说推荐类型', 0, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('顶部小说栏', '1', 'book_rec_type', '小说推荐类型', 1, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('本周强推', '2', 'book_rec_type', '小说推荐类型', 2, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('热门推荐', '3', 'book_rec_type', '小说推荐类型', 3, null, null, null, null, null, '', null);
+INSERT INTO sys_dict (name, value, type, description, sort, parent_id, create_by, create_date, update_by,
+                      update_date, remarks, del_flag)
+VALUES ('精品推荐', '4', 'book_rec_type', '小说推荐类型', 4, null, null, null, null, null, '', null);
+
+
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (320, '300', '小说推荐', 'novel/bookSetting', 'novel:bookSetting:bookSetting', '1', 'fa', '6');
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (321, '320', '查看', null, 'novel:bookSetting:detail', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (322, '320', '新增', null, 'novel:bookSetting:add', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (323, '320', '修改', null, 'novel:bookSetting:edit', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (324, '320', '删除', null, 'novel:bookSetting:remove', '2', null, '6');
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (325, '320', '批量删除', null, 'novel:bookSetting:batchRemove', '2', null, '6');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 320);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 321);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 322);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 323);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 324);
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 325);
+
+
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (410, '400', '会员反馈', 'novel/userFeedback', 'novel:userFeedback:userFeedback', '1', 'fa', '16');
+
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 410);

doc/sql/20230508.sql

@@ -0,0 +1,4 @@
+INSERT INTO `sys_menu` (`menu_id`, `parent_id`, `name`, `url`, `perms`, `type`, `icon`, `order_num`)
+VALUES (305, '301', '修改', null, 'novel:websiteInfo:edit', '2', null, '6');
+INSERT INTO sys_role_menu (role_id, menu_id)
+VALUES (1, 305);

doc/sql/readme.md

@@ -0,0 +1,3 @@
+1. novel_plus.sql 为全量 sql 文件，yyyyMMdd.sql 为增量 sql 文件
+2. 第一次安装只需要执行 novel_plus.sql 文件即可
+3. 后续版本升级需要根据上次代码版本的时间，执行该日期之后的增量 sql 文件（简单来说就是 sql 文件夹中相较于上次多出来的 sql 文件）

novel-admin/Dockerfile

@@ -0,0 +1,9 @@
+FROM openjdk:8
+ADD novel-admin-4.2.0.jar /root
+ENV dburl=""
+ENV username=""
+ENV	password=""
+ENV redishost = ""
+ENV redisport = ""
+ENV redispwd = ""
+ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -Dspring.redis.host=${redishost} -Dspring.redis.port=${redisport} -Dspring.redis.password=${redispwd} -jar /root/novel-admin-4.2.0.jar"]

novel-admin/pom.xml

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.java2nb</groupId>
+    <artifactId>novel-admin</artifactId>
+    <version>4.2.0</version>
+    <packaging>jar</packaging>
+
+    <name>novel-admin</name>
+    <description>小说精品屋后台管理</description>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.1.18.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
+        <velocity.version>1.7</velocity.version>
+        <activiti.version>5.22.0</activiti.version>
+        <sharding.jdbc.version>3.0.0</sharding.jdbc.version>
+        <jackson.version>2.15.1</jackson.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <!--web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <!-- NekoHTML 是一个简单地HTML扫描器和标签补偿器(tag balancer) ,使得程序能解析HTML文档并用标准的XML接口来访问其中的信息。
+         这个解析器能投扫描HTML文件并“修正”许多作者（人或机器）在编写HTML文档过程中常犯的错误。
+         NekoHTML 能增补缺失的父元素、自动用结束标签关闭相应的元素，以及不匹配的内嵌元素标签。
+         NekoHTML 的开发使用了Xerces Native Interface (XNI)，后者是Xerces2的实现基础。-->
+        <dependency>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+        </dependency>
+        <!--mybatis -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.29</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <!--druid -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.9</version>
+        </dependency>
+        <!--commons -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-configuration</groupId>
+            <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+        <!--shiro -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-core</artifactId>
+            <version>1.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-spring</artifactId>
+            <version>1.11.0</version>
+        </dependency>
+        <!-- shiro ehcache -->
+        <dependency>
+            <groupId>org.apache.shiro</groupId>
+            <artifactId>shiro-ehcache</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.sf.ehcache</groupId>
+                    <artifactId>ehcache-core</artifactId>
+                </exclusion>
+            </exclusions>
+            <version>1.11.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.theborakompanioni</groupId>
+            <artifactId>thymeleaf-extras-shiro</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <!-- utils -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+        </dependency>
+        <!--velocity代码生成使用模板 -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.7</version>
+        </dependency>
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->
+        <!--</dependency>-->
+        <!-- quartz -->
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-cache</artifactId>-->
+        <!--</dependency>-->
+
+        <!--<dependency>-->
+        <!--<groupId>net.sf.ehcache</groupId>-->
+        <!--<artifactId>ehcache</artifactId>-->
+        <!--</dependency>-->
+
+
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-devtools</artifactId>-->
+        <!--<optional>true</optional>-->
+        <!--</dependency>-->
+
+        <!--swagger2-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+
+        <!-- 添加redis支持-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.0</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.4</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>${sharding.jdbc.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <version>${sharding.jdbc.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
+        <!--war包部署需要-->
+        <!--<dependency>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-web</artifactId>-->
+        <!--&lt;!&ndash; 移除嵌入式tomcat插件 &ndash;&gt;-->
+        <!--<exclusions>-->
+        <!--<exclusion>-->
+        <!--<groupId>org.springframework.boot</groupId>-->
+        <!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
+        <!--</exclusion>-->
+        <!--</exclusions>-->
+        <!--</dependency>-->
+        <!--<dependency>-->
+        <!--<groupId>javax.servlet</groupId>-->
+        <!--<artifactId>javax.servlet-api</artifactId>-->
+        <!--<version>3.1.0</version>-->
+        <!--<scope>provided</scope>-->
+        <!--</dependency>-->
+    </dependencies>
+    <!--  <build>
+          <plugins>
+              &lt;!&ndash;<plugin>
+                  <groupId>org.springframework.boot</groupId>
+                  <artifactId>spring-boot-maven-plugin</artifactId>
+                  <configuration>
+                      <executable>true</executable>
+                  </configuration>
+              </plugin>&ndash;&gt;
+              &lt;!&ndash;SpringBoot项目默认使用spring-boot-maven-plugin，要打成被其他项目引用的jar包，需要更换此插件&ndash;&gt;
+              &lt;!&ndash; <plugin>
+                   <groupId>org.apache.maven.plugins</groupId>
+                   <artifactId>maven-compiler-plugin</artifactId>
+                   <configuration>
+                       <source>1.8</source>
+                       <target>1.8</target>
+                       <encoding>UTF-8</encoding>
+                   </configuration>
+               </plugin>&ndash;&gt;
+              <plugin>
+                  <groupId>org.springframework.boot</groupId>
+                  <artifactId>spring-boot-maven-plugin</artifactId>
+              </plugin>
+          </plugins>
+      </build>-->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!-- 文件夹 -->
+                                <copy todir="${project.build.directory}/build/config" overwrite="true">
+                                    <fileset dir="${basedir}/src/main/build/config">
+                                        <include name="*.*"/>
+                                    </fileset>
+                                </copy>
+                                <copy file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
+                                      tofile="${project.build.directory}/build/${project.artifactId}.jar"/>
+
+                                <fixcrlf srcdir="${basedir}/src/main/build/scripts" eol="unix"/>
+                                <copy todir="${project.build.directory}/build/bin">
+                                    <fileset dir="${basedir}/src/main/build/scripts">
+                                        <include name="*.sh"/>
+                                        <include name="*.txt"/>
+                                        <include name="*.bat"/>
+                                    </fileset>
+                                </copy>
+                                <zip destfile='${project.build.directory}/build/${project.artifactId}.zip'>
+                                    <zipfileset filemode="755" dir='${project.build.directory}/build/'/>
+                                </zip>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <repositories>
+        <repository>
+            <id>ali</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>ali-plugin</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+</project>

novel-admin/src/main/build/config/application-prod.yml

@@ -0,0 +1,20 @@
+#端口号
+server:
+  port: 8088
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password: test123456
+
+sharding:
+  jdbc:
+    datasource:
+      ds0:
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456

novel-admin/src/main/build/scripts/novel-admin.sh

@@ -0,0 +1,94 @@
+#!/bin/sh
+APP_NAME=novel-admin
+JAR_NAME=$APP_NAME\.jar
+#PID  代表是PID文件
+PID=$APP_NAME\.pid
+
+
+#使用说明，用来提示输入参数
+usage() {
+    echo "Usage: ./novel-admin.sh [start|stop|restart|status]"
+    exit 1
+}
+
+#检查程序是否在运行
+is_exist(){
+  pid=`ps -ef|grep $JAR_NAME|grep -v grep|awk '{print $2}' `
+  #如果不存在返回1，存在返回0     
+  if [ -z "${pid}" ]; then
+   return 1
+  else
+    return 0
+  fi
+}
+
+#启动方法
+start(){
+  is_exist
+  if [ $? -eq "0" ]; then 
+    echo ">>> 小说精品屋后台正在运行 PID = ${pid} <<<" 
+  else 
+    echo ">>> 小说精品屋后台开始启动 <<<" 
+    nohup java -jar -Dspring.profiles.active=prod $JAR_NAME >/dev/null 2>&1 &
+    sleep 20
+    echo $! > $PID
+    echo ">>> 小说精品屋后台启动完成 PID = $! <<<" 
+    status
+   fi
+  }
+
+#停止方法
+stop(){
+  #is_exist
+  pidf=$(cat $PID)
+  #echo "$pidf"  
+  echo ">>> 小说精品屋后台 PID = $pidf 开始停止 <<<"
+  kill $pidf
+  rm -rf $PID
+  sleep 2
+  is_exist
+  if [ $? -eq "0" ]; then 
+    echo ">>> 小说精品屋后台 PID = $pid 开始强制停止 <<<"
+    kill -9  $pid
+    sleep 2
+    status 
+  else
+    status
+  fi  
+}
+
+#输出运行状态
+status(){
+  is_exist
+  if [ $? -eq "0" ]; then
+    echo ">>> 小说精品屋后台正在运行 PID = ${pid} <<<"
+  else
+    echo ">>> 小说精品屋后台没有运行 <<<"
+  fi
+}
+
+#重启
+restart(){
+  stop
+  start
+}
+
+#根据输入参数，选择执行对应方法，不输入则执行使用说明
+case "$1" in
+  "start")
+    start
+    ;;
+  "stop")
+    stop
+    ;;
+  "status")
+    status
+    ;;
+  "restart")
+    restart
+    ;;
+  *)
+    usage
+    ;;
+esac
+exit 0

novel-admin/src/main/java/com/java2nb/AdminApplication.java

@@ -0,0 +1,37 @@
+package com.java2nb;
+
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import java.net.InetAddress;
+
+
+@EnableTransactionManagement
+@ServletComponentScan
+@MapperScan("com.java2nb.*.dao")
+@SpringBootApplication(exclude = {
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+})
+@EnableCaching
+@Slf4j
+public class AdminApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(AdminApplication.class, args);
+    }
+
+    @Bean
+    public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
+        return args -> {
+            log.info("项目启动啦，访问路径：{}", "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + ctx.getEnvironment().getProperty("server.port"));
+        };
+    }
+
+}

novel-admin/src/main/java/com/java2nb/common/annotation/Log.java

@@ -0,0 +1,12 @@
+package com.java2nb.common.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.lang.annotation.RetentionPolicy;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Log {
+	String value() default "";
+}

novel-admin/src/main/java/com/java2nb/common/aspect/LogAspect.java

@@ -0,0 +1,104 @@
+package com.java2nb.common.aspect;
+
+import java.lang.reflect.Method;
+import java.util.Date;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.java2nb.common.service.LogService;
+import com.java2nb.system.domain.UserToken;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+import com.java2nb.common.annotation.Log;
+import com.java2nb.common.dao.LogDao;
+import com.java2nb.common.domain.LogDO;
+import com.java2nb.common.utils.HttpContextUtils;
+import com.java2nb.common.utils.IPUtils;
+import com.java2nb.common.utils.JSONUtils;
+import com.java2nb.common.utils.ShiroUtils;
+import com.java2nb.system.domain.UserDO;
+
+@Aspect
+@Component
+public class LogAspect {
+    private static final Logger logger = LoggerFactory.getLogger(LogAspect.class);
+
+    @Autowired
+    LogService logService;
+
+
+    @Pointcut("@annotation(com.java2nb.common.annotation.Log)")
+    public void logPointCut() {
+    }
+
+    @Around("logPointCut()")
+    public Object around(ProceedingJoinPoint point) throws Throwable {
+        long beginTime = System.currentTimeMillis();
+        // 执行方法
+        Object result = point.proceed();
+        // 执行时长(毫秒)
+        long time = System.currentTimeMillis() - beginTime;
+        //异步保存日志
+        saveLog(point, time);
+        return result;
+    }
+
+    void saveLog(ProceedingJoinPoint joinPoint, long time) throws InterruptedException {
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method = signature.getMethod();
+        LogDO sysLog = new LogDO();
+        Log syslog = method.getAnnotation(Log.class);
+        if (syslog != null) {
+            // 注解上的描述
+            sysLog.setOperation(syslog.value());
+        }
+        // 请求的方法名
+        String className = joinPoint.getTarget().getClass().getName();
+        String methodName = signature.getName();
+        sysLog.setMethod(className + "." + methodName + "()");
+        // 请求的参数
+        Object[] args = joinPoint.getArgs();
+        try {
+            String params = JSONUtils.beanToJson(args[0]).substring(0, 4999);
+            sysLog.setParams(params);
+        } catch (Exception e) {
+
+        }
+        // 获取request
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        // 设置IP地址
+        sysLog.setIp(IPUtils.getIpAddr(request));
+        // 用户名
+        UserDO currUser = ShiroUtils.getUser();
+        if (null == currUser) {
+            if (null != sysLog.getParams()) {
+                sysLog.setUserId(-1L);
+                sysLog.setUsername(sysLog.getParams());
+            } else {
+                sysLog.setUserId(-1L);
+                sysLog.setUsername("获取用户信息为空");
+            }
+        } else {
+            sysLog.setUserId(ShiroUtils.getUserId());
+            sysLog.setUsername(ShiroUtils.getUser().getUsername());
+        }
+        sysLog.setTime((int) time);
+        // 系统当前时间
+        Date date = new Date();
+        sysLog.setGmtCreate(date);
+        // 保存系统日志
+        logService.save(sysLog);
+    }
+}

novel-admin/src/main/java/com/java2nb/common/aspect/WebLogAspect.java

@@ -0,0 +1,61 @@
+package com.java2nb.common.aspect;
+
+import com.java2nb.common.utils.HttpContextUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import sun.net.util.IPAddressUtil;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+@Aspect
+@Component
+public class WebLogAspect {
+
+    private static final Logger logger = LoggerFactory.getLogger(WebLogAspect.class);
+
+    @Pointcut("execution( * com.java2nb..controller.*.*(..))")//两个..代表所有子目录，最后括号里的两个..代表所有参数
+    public void logPointCut() {
+    }
+
+
+    @Before("logPointCut()")
+    public void doBefore(JoinPoint joinPoint) throws Throwable {
+        // 接收到请求，记录请求内容
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = attributes.getRequest();
+
+        // 记录下请求内容
+        logger.info("请求地址 : " + request.getRequestURL().toString());
+        logger.info("HTTP METHOD : " + request.getMethod());
+        // 获取真实的ip地址
+        //logger.info("IP : " + IPAddressUtil.getClientIpAddress(request));
+        logger.info("CLASS_METHOD : " + joinPoint.getSignature().getDeclaringTypeName() + "."
+                + joinPoint.getSignature().getName());
+        logger.info("参数 : " + Arrays.toString(joinPoint.getArgs()));
+//        loggger.info("参数 : " + joinPoint.getArgs());
+
+    }
+
+    @AfterReturning(returning = "ret", pointcut = "logPointCut()")// returning的值和doAfterReturning的参数名一致
+    public void doAfterReturning(Object ret) throws Throwable {
+        // 处理完请求，返回内容(返回值太复杂时，打印的是物理存储空间的地址)
+        logger.debug("返回值 : " + ret);
+    }
+
+    @Around("logPointCut()")
+    public Object doAround(ProceedingJoinPoint pjp) throws Throwable {
+        long startTime = System.currentTimeMillis();
+        Object ob = pjp.proceed();// ob 为方法的返回值
+        logger.info("耗时 : " + (System.currentTimeMillis() - startTime));
+        return ob;
+    }
+}

novel-admin/src/main/java/com/java2nb/common/config/ApplicationContextRegister.java

@@ -0,0 +1,50 @@
+package com.java2nb.common.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author xiongxy
+ * @date 2019-09-25 15:09:21
+ * <p>
+ * Email 122741482@qq.com
+ * <p>
+ * Describe:
+ */
+@Component
+public class ApplicationContextRegister implements ApplicationContextAware {
+    private static Logger logger = LoggerFactory.getLogger(ApplicationContextRegister.class);
+    private static ApplicationContext APPLICATION_CONTEXT;
+    /**
+     * 设置spring上下文
+     * @param applicationContext spring上下文
+     * @throws BeansException
+     * */
+    @Override  public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        logger.debug("ApplicationContext registed-->{}", applicationContext);
+        APPLICATION_CONTEXT = applicationContext;
+    }
+
+    /**
+     * 获取容器
+     * @return
+     */
+    public static ApplicationContext getApplicationContext() {
+        return APPLICATION_CONTEXT;
+    }
+
+    /**
+     * 获取容器对象
+     * @param type
+     * @param <T>
+     * @return
+     */
+    public static <T> T getBean(Class<T> type) {
+        return APPLICATION_CONTEXT.getBean(type);
+    }
+}

novel-admin/src/main/java/com/java2nb/common/config/BDSessionListener.java

@@ -0,0 +1,32 @@
+package com.java2nb.common.config;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.shiro.session.Session;
+import org.apache.shiro.session.SessionListener;
+
+public class BDSessionListener implements SessionListener {
+
+	private final AtomicInteger sessionCount = new AtomicInteger(0);
+
+	@Override
+	public void onStart(Session session) {
+		sessionCount.incrementAndGet();
+	}
+
+	@Override
+	public void onStop(Session session) {
+		sessionCount.decrementAndGet();
+	}
+
+	@Override
+	public void onExpiration(Session session) {
+		sessionCount.decrementAndGet();
+
+	}
+
+	public int getSessionCount() {
+		return sessionCount.get();
+	}
+
+}

novel-admin/src/main/java/com/java2nb/common/config/CacheKey.java

@@ -0,0 +1,73 @@
+package com.java2nb.common.config;
+
+/**
+ * @author 11797
+ */
+public interface CacheKey {
+
+    /**
+     * 首页小说设置
+     */
+    String INDEX_BOOK_SETTINGS_KEY = "indexBookSettingsKey";
+
+    /**
+     * 首页新闻
+     */
+    String INDEX_NEWS_KEY = "indexNewsKey";
+
+    /**
+     * 首页点击榜单
+     */
+    String INDEX_CLICK_BANK_BOOK_KEY = "indexClickBankBookKey";
+
+    /**
+     * 首页友情链接
+     */
+    String INDEX_LINK_KEY = "indexLinkKey";
+
+    /**
+     * 首页新书榜单
+     */
+    String INDEX_NEW_BOOK_KEY = "indexNewBookKey";
+
+
+    /**
+     * 首页更新榜单
+     */
+    String INDEX_UPDATE_BOOK_KEY = "indexUpdateBookKey";
+
+    /**
+     * 模板目录保存key
+     */
+    String TEMPLATE_DIR_KEY = "templateDirKey";
+    ;
+
+    /**
+     * 正在运行的爬虫线程存储KEY前缀
+     */
+    String RUNNING_CRAWL_THREAD_KEY_PREFIX = "runningCrawlTreadDataKeyPrefix";
+
+    /**
+     * 上一次搜索引擎更新的时间
+     */
+    String ES_LAST_UPDATE_TIME = "esLastUpdateTime";
+
+    /**
+     * 搜索引擎转换锁
+     */
+    String ES_TRANS_LOCK = "esTransLock";
+
+    /**
+     * 上一次搜索引擎是否更新过小说点击量
+     */
+    String ES_IS_UPDATE_VISIT = "esIsUpdateVisit";
+
+    /**
+     * 累积的小说点击量
+     */
+    String BOOK_ADD_VISIT_COUNT = "bookAddVisitCount";
+    /**
+     * 测试爬虫规则缓存
+     */
+    String BOOK_TEST_PARSE = "testParse";
+}

novel-admin/src/main/java/com/java2nb/common/config/Constant.java

@@ -0,0 +1,27 @@
+package com.java2nb.common.config;
+
+public class Constant {
+
+    //演示系统账户
+    public static String DEMO_ACCOUNT = "test";
+    //自动去除表前缀
+    public static String AUTO_REOMVE_PRE = "true";
+    //停止计划任务
+    public static String STATUS_RUNNING_STOP = "stop";
+    //开启计划任务
+    public static String STATUS_RUNNING_START = "start";
+    //通知公告阅读状态-未读
+    public static String OA_NOTIFY_READ_NO = "0";
+    //通知公告阅读状态-已读
+    public static int OA_NOTIFY_READ_YES = 1;
+    //部门根节点id
+    public static Long DEPT_ROOT_ID = 0l;
+    //缓存方式
+    public static String CACHE_TYPE_REDIS = "redis";
+
+    public static String LOG_ERROR = "error";
+
+    public static final String UPLOAD_FILES_PREFIX = "/files/";
+
+
+}

novel-admin/src/main/java/com/java2nb/common/config/DateConverConfig.java

@@ -0,0 +1,40 @@
+package com.java2nb.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.zip.DataFormatException;
+
+/**
+ * @author xiongxy
+ * @date 2019-09-25 15:09:21
+ */
+@Configuration
+public class DateConverConfig {
+    @Bean
+    public Converter<String, Date> stringDateConvert() {
+        return new Converter<String, Date>() {
+            @Override
+            public Date convert(String source) {
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date date = null;
+                try {
+                    date = sdf.parse((String) source);
+                } catch (Exception e) {
+                    SimpleDateFormat sdfday = new SimpleDateFormat("yyyy-MM-dd");
+                    try {
+                        date = sdfday.parse((String) source);
+                    } catch (ParseException e1) {
+                        e1.printStackTrace();
+                    }
+                }
+                return date;
+            }
+        };
+    }
+
+}

novel-admin/src/main/java/com/java2nb/common/config/DruidDBConfig.java

@@ -0,0 +1,132 @@
+package com.java2nb.common.config;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.http.StatViewServlet;
+import com.alibaba.druid.support.http.WebStatFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+/**
+ * Created by PrimaryKey on 17/2/4.
+ */
+@SuppressWarnings("AlibabaRemoveCommentedCode")
+@Configuration
+public class DruidDBConfig {
+    private Logger logger = LoggerFactory.getLogger(DruidDBConfig.class);
+    @Value("${spring.datasource.url}")
+    private String dbUrl;
+
+    @Value("${spring.datasource.username}")
+    private String username;
+
+    @Value("${spring.datasource.password}")
+    private String password;
+
+    @Value("${spring.datasource.driverClassName}")
+    private String driverClassName;
+
+    @Value("${spring.datasource.initialSize}")
+    private int initialSize;
+
+    @Value("${spring.datasource.minIdle}")
+    private int minIdle;
+
+    @Value("${spring.datasource.maxActive}")
+    private int maxActive;
+
+    @Value("${spring.datasource.maxWait}")
+    private int maxWait;
+
+    @Value("${spring.datasource.timeBetweenEvictionRunsMillis}")
+    private int timeBetweenEvictionRunsMillis;
+
+    @Value("${spring.datasource.minEvictableIdleTimeMillis}")
+    private int minEvictableIdleTimeMillis;
+
+    @Value("${spring.datasource.validationQuery}")
+    private String validationQuery;
+
+    @Value("${spring.datasource.testWhileIdle}")
+    private boolean testWhileIdle;
+
+    @Value("${spring.datasource.testOnBorrow}")
+    private boolean testOnBorrow;
+
+    @Value("${spring.datasource.testOnReturn}")
+    private boolean testOnReturn;
+
+    @Value("${spring.datasource.poolPreparedStatements}")
+    private boolean poolPreparedStatements;
+
+    @Value("${spring.datasource.maxPoolPreparedStatementPerConnectionSize}")
+    private int maxPoolPreparedStatementPerConnectionSize;
+
+    @Value("${spring.datasource.filters}")
+    private String filters;
+
+    @Value("{spring.datasource.connectionProperties}")
+    private String connectionProperties;
+
+    @Bean(initMethod = "init", destroyMethod = "close")   //声明其为Bean实例
+    @Primary  //在同样的DataSource中，首先使用被标注的DataSource
+    public DataSource dataSource() {
+        DruidDataSource datasource = new DruidDataSource();
+
+        datasource.setUrl(this.dbUrl);
+        datasource.setUsername(username);
+        datasource.setPassword(password);
+        datasource.setDriverClassName(driverClassName);
+
+        //configuration
+        datasource.setInitialSize(initialSize);
+        datasource.setMinIdle(minIdle);
+        datasource.setMaxActive(maxActive);
+        datasource.setMaxWait(maxWait);
+        datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
+        datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
+        datasource.setValidationQuery(validationQuery);
+        datasource.setTestWhileIdle(testWhileIdle);
+        datasource.setTestOnBorrow(testOnBorrow);
+        datasource.setTestOnReturn(testOnReturn);
+        datasource.setPoolPreparedStatements(poolPreparedStatements);
+        datasource.setMaxPoolPreparedStatementPerConnectionSize(maxPoolPreparedStatementPerConnectionSize);
+        try {
+            datasource.setFilters(filters);
+        } catch (SQLException e) {
+            logger.error("druid configuration initialization filter", e);
+        }
+        datasource.setConnectionProperties(connectionProperties);
+
+        return datasource;
+    }
+
+    @Bean
+    public ServletRegistrationBean druidServlet() {
+        ServletRegistrationBean reg = new ServletRegistrationBean();
+        reg.setServlet(new StatViewServlet());
+        reg.addUrlMappings("/druid/*");
+        reg.addInitParameter("allow", ""); //白名单
+        return reg;
+    }
+
+    @Bean public FilterRegistrationBean filterRegistrationBean() {
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+        filterRegistrationBean.setFilter(new WebStatFilter());
+        filterRegistrationBean.addUrlPatterns("/*");
+        filterRegistrationBean.addInitParameter("exclusions", "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*");
+        filterRegistrationBean.addInitParameter("profileEnable", "true");
+        filterRegistrationBean.addInitParameter("principalCookieName","USER_COOKIE");
+        filterRegistrationBean.addInitParameter("principalSessionName","USER_SESSION");
+        filterRegistrationBean.addInitParameter("DruidWebStatFilter","/*");
+        return filterRegistrationBean;
+    }
+}
+

novel-admin/src/main/java/com/java2nb/common/config/JnConfig.java

@@ -0,0 +1,39 @@
+package com.java2nb.common.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix="java2nb")
+public class JnConfig {
+	//上传路径
+	private String uploadPath;
+
+	private String username;
+
+	private String password;
+
+	public String getUploadPath() {
+		return uploadPath;
+	}
+
+	public void setUploadPath(String uploadPath) {
+		this.uploadPath = uploadPath;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+}

novel-admin/src/main/java/com/java2nb/common/config/SecuityConfig.java

@@ -0,0 +1,13 @@
+package com.java2nb.common.config;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
+@EnableAutoConfiguration(exclude = {
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+})
+@Configuration
+public class SecuityConfig {
+
+
+}

novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java

@@ -0,0 +1,172 @@
+package com.java2nb.common.config;
+
+import at.pollux.thymeleaf.shiro.dialect.ShiroDialect;
+import com.java2nb.common.redis.shiro.RedisCacheManager;
+import com.java2nb.common.redis.shiro.RedisManager;
+import com.java2nb.common.redis.shiro.RedisSessionDAO;
+import com.java2nb.system.shiro.UserRealm;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.session.SessionListener;
+import org.apache.shiro.session.mgt.eis.SessionDAO;
+import org.apache.shiro.spring.LifecycleBeanPostProcessor;
+import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
+import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
+import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
+import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+
+/**
+ * @author xiongxy
+ */
+@Configuration
+public class ShiroConfig {
+
+    @Value("${spring.redis.host}")
+    private String host;
+    @Value("${spring.redis.password}")
+    private String password;
+    @Value("${spring.redis.port}")
+    private int port;
+    @Value("${spring.redis.timeout}")
+    private int timeout;
+
+    @Value("${server.session-timeout}")
+    private int tomcatTimeout;
+
+    @Bean
+    public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() {
+        return new LifecycleBeanPostProcessor();
+    }
+
+    /**
+     * ShiroDialect，为了在thymeleaf里使用shiro的标签的bean
+     *
+     * @return
+     */
+    @Bean
+    public ShiroDialect shiroDialect() {
+        return new ShiroDialect();
+    }
+
+    @Bean
+    ShiroFilterFactoryBean shiroFilterFactoryBean(SecurityManager securityManager) {
+        ShiroFilterFactoryBean shiroFilterFactoryBean = new ShiroFilterFactoryBean();
+        shiroFilterFactoryBean.setSecurityManager(securityManager);
+        shiroFilterFactoryBean.setLoginUrl("/login");
+        shiroFilterFactoryBean.setSuccessUrl("/index");
+        shiroFilterFactoryBean.setUnauthorizedUrl("/403");
+        LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
+        filterChainDefinitionMap.put("/login", "anon");
+        filterChainDefinitionMap.put("/getVerify", "anon");
+        filterChainDefinitionMap.put("/css/**", "anon");
+        filterChainDefinitionMap.put("/js/**", "anon");
+        filterChainDefinitionMap.put("/fonts/**", "anon");
+        filterChainDefinitionMap.put("/img/**", "anon");
+        filterChainDefinitionMap.put("/favicon.ico", "anon");
+        filterChainDefinitionMap.put("/docs/**", "anon");
+        filterChainDefinitionMap.put("/layuimini/**", "anon");
+        filterChainDefinitionMap.put("/upload/**", "anon");
+        filterChainDefinitionMap.put(Constant.UPLOAD_FILES_PREFIX + "**", "anon");
+        filterChainDefinitionMap.put("/logout", "logout");
+        filterChainDefinitionMap.put("/blog", "anon");
+        filterChainDefinitionMap.put("/blog/open/**", "anon");
+        filterChainDefinitionMap.put("/**", "authc");
+        shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
+        return shiroFilterFactoryBean;
+    }
+
+
+    @Bean
+    public SecurityManager securityManager() {
+        DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
+        //设置realm.
+        securityManager.setRealm(userRealm());
+        // 自定义缓存实现 使用redis
+        securityManager.setCacheManager(rediscacheManager());
+        securityManager.setSessionManager(sessionManager());
+        return securityManager;
+    }
+
+    @Bean
+    UserRealm userRealm() {
+        UserRealm userRealm = new UserRealm();
+        return userRealm;
+    }
+
+    /**
+     * 开启shiro aop注解支持. 使用代理方式;所以需要开启代码支持;
+     *
+     * @param securityManager
+     * @return
+     */
+    @Bean
+    public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager) {
+        AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor();
+        authorizationAttributeSourceAdvisor.setSecurityManager(securityManager);
+        return authorizationAttributeSourceAdvisor;
+    }
+
+    /**
+     * 配置shiro redisManager
+     *
+     * @return
+     */
+    @Bean
+    public RedisManager redisManager() {
+        RedisManager redisManager = new RedisManager();
+        redisManager.setHost(host);
+        redisManager.setPort(port);
+        redisManager.setExpire(1800);// 配置缓存过期时间
+        //redisManager.setTimeout(1800);
+        redisManager.setPassword(password);
+        return redisManager;
+    }
+
+    /**
+     * cacheManager 缓存 redis实现 使用的是shiro-redis开源插件
+     *
+     * @return
+     */
+    public RedisCacheManager rediscacheManager() {
+        RedisCacheManager redisCacheManager = new RedisCacheManager();
+        redisCacheManager.setRedisManager(redisManager());
+        return redisCacheManager;
+    }
+
+
+    /**
+     * RedisSessionDAO shiro sessionDao层的实现 通过redis 使用的是shiro-redis开源插件
+     */
+    @Bean
+    public RedisSessionDAO redisSessionDAO() {
+        RedisSessionDAO redisSessionDAO = new RedisSessionDAO();
+        redisSessionDAO.setRedisManager(redisManager());
+        return redisSessionDAO;
+    }
+
+    @Bean
+    public SessionDAO sessionDAO() {
+        return redisSessionDAO();
+    }
+
+    /**
+     * shiro session的管理
+     */
+    @Bean
+    public DefaultWebSessionManager sessionManager() {
+        DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
+        sessionManager.setGlobalSessionTimeout(tomcatTimeout * 1000);
+        sessionManager.setSessionDAO(sessionDAO());
+        Collection<SessionListener> listeners = new ArrayList<SessionListener>();
+        listeners.add(new BDSessionListener());
+        sessionManager.setSessionListeners(listeners);
+        return sessionManager;
+    }
+
+}

novel-admin/src/main/java/com/java2nb/common/config/SpringAsyncConfig.java

@@ -0,0 +1,23 @@
+package com.java2nb.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.RejectedExecutionHandler;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+@EnableAsync
+public class SpringAsyncConfig {
+//    @Bean
+//    public AsyncTaskExecutor taskExecutor() {
+//        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+//        executor.setMaxPoolSize(10);
+//        return executor;
+//    }
+}

novel-admin/src/main/java/com/java2nb/common/config/Swagger2Config.java

@@ -0,0 +1,48 @@
+package com.java2nb.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * ${DESCRIPTION}
+ *
+ * @author xiongxy
+ * @create 2019-11-02 23:53
+ */
+@EnableSwagger2
+@Configuration
+public class Swagger2Config {
+
+    @Bean
+    public Docket createRestApi() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                //为当前包路径
+                .apis(RequestHandlerSelectors.any())
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    //构建 api文档的详细信息函数
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                //页面标题
+                .title("功能测试")
+                //创建人
+                .contact(new Contact("xiongxy", "1179705413@qq.com", "1179705413@qq.com"))
+                //版本号
+                .version("1.0")
+                //描述
+                .description("API 描述")
+                .build();
+    }
+}

novel-admin/src/main/java/com/java2nb/common/config/WebConfigurer.java

@@ -0,0 +1,20 @@
+package com.java2nb.common.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+@Component
+class WebConfigurer extends WebMvcConfigurerAdapter {
+
+    @Autowired
+    JnConfig jnConfig;
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler(Constant.UPLOAD_FILES_PREFIX + "**")
+            .addResourceLocations("file:///" + jnConfig.getUploadPath());
+    }
+
+}

novel-admin/src/main/java/com/java2nb/common/controller/BaseController.java

@@ -0,0 +1,21 @@
+package com.java2nb.common.controller;
+
+import com.java2nb.system.domain.UserToken;
+import org.springframework.stereotype.Controller;
+import com.java2nb.common.utils.ShiroUtils;
+import com.java2nb.system.domain.UserDO;
+
+@Controller
+public class BaseController {
+	public UserDO getUser() {
+		return ShiroUtils.getUser();
+	}
+
+	public Long getUserId() {
+		return getUser().getUserId();
+	}
+
+	public String getUsername() {
+		return getUser().getUsername();
+	}
+}

novel-admin/src/main/java/com/java2nb/common/controller/DictController.java

@@ -0,0 +1,148 @@
+package com.java2nb.common.controller;
+
+import com.java2nb.common.config.Constant;
+import com.java2nb.common.domain.DictDO;
+import com.java2nb.common.service.DictService;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 字典表
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2019-09-29 18:28:07
+ */
+
+@Controller
+@RequestMapping("/common/dict")
+public class DictController extends BaseController {
+	@Autowired
+	private DictService dictService;
+
+	@GetMapping()
+	@RequiresPermissions("common:dict:dict")
+	String dict() {
+		return "common/dict/dict";
+	}
+
+	@ResponseBody
+	@GetMapping("/list")
+	@RequiresPermissions("common:dict:dict")
+	public PageBean list(@RequestParam Map<String, Object> params) {
+		// 查询列表数据
+		Query query = new Query(params);
+		List<DictDO> dictList = dictService.list(query);
+		int total = dictService.count(query);
+		PageBean pageBean = new PageBean(dictList, total);
+		return pageBean;
+	}
+
+	@GetMapping("/add")
+	@RequiresPermissions("common:dict:add")
+	String add() {
+		return "common/dict/add";
+	}
+
+	@GetMapping("/edit/{id}")
+	@RequiresPermissions("common:dict:edit")
+	String edit(@PathVariable("id") Long id, Model model) {
+		DictDO dict = dictService.get(id);
+		model.addAttribute("dict", dict);
+		return "common/dict/edit";
+	}
+
+	/**
+	 * 保存
+	 */
+	@ResponseBody
+	@PostMapping("/save")
+	@RequiresPermissions("common:dict:add")
+	public R save(DictDO dict) {
+		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+		}
+		if (dictService.save(dict) > 0) {
+			return R.ok();
+		}
+		return R.error();
+	}
+
+	/**
+	 * 修改
+	 */
+	@ResponseBody
+	@RequestMapping("/update")
+	@RequiresPermissions("common:dict:edit")
+	public R update(DictDO dict) {
+		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+		}
+		dictService.update(dict);
+		return R.ok();
+	}
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ResponseBody
+	@RequiresPermissions("common:dict:remove")
+	public R remove(Long id) {
+		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+		}
+		if (dictService.remove(id) > 0) {
+			return R.ok();
+		}
+		return R.error();
+	}
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/batchRemove")
+	@ResponseBody
+	@RequiresPermissions("common:dict:batchRemove")
+	public R remove(@RequestParam("ids[]") Long[] ids) {
+		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+		}
+		dictService.batchRemove(ids);
+		return R.ok();
+	}
+
+	@GetMapping("/type")
+	@ResponseBody
+	public List<DictDO> listType() {
+		return dictService.listType();
+	};
+
+	// 类别已经指定增加
+	@GetMapping("/add/{type}/{description}")
+	@RequiresPermissions("common:dict:add")
+	String addD(Model model, @PathVariable("type") String type, @PathVariable("description") String description) {
+		model.addAttribute("type", type);
+		model.addAttribute("description", description);
+		return "common/dict/add";
+	}
+
+	@ResponseBody
+	@GetMapping("/list/{type}")
+	public List<DictDO> listByType(@PathVariable("type") String type) {
+		// 查询列表数据
+		Map<String, Object> map = new HashMap<>(16);
+		map.put("type", type);
+		List<DictDO> dictList = dictService.list(map);
+		return dictList;
+	}
+}

novel-admin/src/main/java/com/java2nb/common/controller/FileController.java

@@ -0,0 +1,200 @@
+package com.java2nb.common.controller;
+
+import com.java2nb.common.config.Constant;
+import com.java2nb.common.config.JnConfig;
+import com.java2nb.common.domain.FileDO;
+import com.java2nb.common.service.FileService;
+import com.java2nb.common.utils.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件上传
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2019-09-19 16:02:20
+ */
+@Controller
+@RequestMapping("/common/sysFile")
+public class FileController extends BaseController {
+
+    @Autowired
+    private FileService sysFileService;
+
+    @Autowired
+    private JnConfig jnConfig;
+
+    @GetMapping()
+    @RequiresPermissions("common:sysFile:sysFile")
+    String sysFile(Model model) {
+        Map<String, Object> params = new HashMap<>(16);
+        return "common/file/file";
+    }
+
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("common:sysFile:sysFile")
+    public PageBean list(@RequestParam Map<String, Object> params) {
+        // 查询列表数据
+        Query query = new Query(params);
+        List<FileDO> sysFileList = sysFileService.list(query);
+        int total = sysFileService.count(query);
+        PageBean pageBean = new PageBean(sysFileList, total);
+        return pageBean;
+    }
+
+    @GetMapping("/add")
+        // @RequiresPermissions("common:bComments")
+    String add() {
+        return "common/sysFile/add";
+    }
+
+    @GetMapping("/edit")
+        // @RequiresPermissions("common:bComments")
+    String edit(Long id, Model model) {
+        FileDO sysFile = sysFileService.get(id);
+        model.addAttribute("sysFile", sysFile);
+        return "common/sysFile/edit";
+    }
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    @RequiresPermissions("common:info")
+    public R info(@PathVariable("id") Long id) {
+        FileDO sysFile = sysFileService.get(id);
+        return R.ok().put("sysFile", sysFile);
+    }
+
+    /**
+     * 保存
+     */
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("common:save")
+    public R save(FileDO sysFile) {
+        if (sysFileService.save(sysFile) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("common:update")
+    public R update(@RequestBody FileDO sysFile) {
+        sysFileService.update(sysFile);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/remove")
+    @ResponseBody
+    // @RequiresPermissions("common:remove")
+    public R remove(Long id, HttpServletRequest request) {
+        if ("test".equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        String fileName =
+            jnConfig.getUploadPath() + sysFileService.get(id).getUrl().replace(Constant.UPLOAD_FILES_PREFIX, "");
+        if (sysFileService.remove(id) > 0) {
+            boolean b = FileUtil.deleteFile(fileName);
+            if (!b) {
+                return R.error("数据库记录删除成功，文件删除失败");
+            }
+            return R.ok();
+        } else {
+            return R.error();
+        }
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("common:remove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+        if ("test".equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        sysFileService.batchRemove(ids);
+        return R.ok();
+    }
+
+    @ResponseBody
+    @PostMapping("/upload")
+    R upload(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+        if ("test".equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        Date date = new Date();
+        String year = DateUtils.format(date, DateUtils.YEAR_PATTERN);
+        String month = DateUtils.format(date, DateUtils.MONTH_PATTERN);
+        String day = DateUtils.format(date, DateUtils.DAY_PATTERN);
+
+        String fileName = file.getOriginalFilename();
+        String fileDir = year + "/" + month + "/" + day + "/";
+        fileName = FileUtil.renameToUUID(fileName);
+        FileDO sysFile = new FileDO(FileType.fileType(fileName), Constant.UPLOAD_FILES_PREFIX + fileDir + fileName,
+            date);
+        try {
+            FileUtil.uploadFile(file.getBytes(), jnConfig.getUploadPath() + fileDir, fileName);
+        } catch (Exception e) {
+            return R.error();
+        }
+
+        if (sysFileService.save(sysFile) > 0) {
+            return R.ok().put("fileName", sysFile.getUrl());
+        }
+        return R.error();
+    }
+
+    /**
+     * 文件下载
+     */
+    @RequestMapping(value = "/download")
+    public void fileDownload(String filePath, String fileName, HttpServletResponse resp) throws Exception {
+        String realFilePath = jnConfig.getUploadPath() + filePath;
+        InputStream in = new FileInputStream(realFilePath);
+        //设置响应头，对文件进行url编码
+        fileName = URLEncoder.encode(fileName, "UTF-8");
+        resp.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+
+        resp.setContentLength(in.available());
+
+        OutputStream out = resp.getOutputStream();
+        byte[] b = new byte[1024];
+        int len = 0;
+        while ((len = in.read(b)) != -1) {
+            out.write(b, 0, len);
+        }
+        out.flush();
+        out.close();
+        in.close();
+    }
+
+
+}

novel-admin/src/main/java/com/java2nb/common/controller/GeneratorController.java

@@ -0,0 +1,157 @@
+package com.java2nb.common.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.java2nb.common.domain.GenColumnsDO;
+import com.java2nb.common.service.GeneratorService;
+import com.java2nb.common.utils.GenUtils;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.R;
+import io.swagger.annotations.ApiOperation;
+import lombok.SneakyThrows;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RequestMapping("/common/generator")
+@Controller
+public class GeneratorController {
+    String prefix = "common/generator";
+    @Autowired
+    GeneratorService generatorService;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @GetMapping()
+    String generator() {
+        return prefix + "/list";
+    }
+
+    @ResponseBody
+    @GetMapping("/list")
+    List<Map<String, Object>> list(String tableName) {
+        List<Map<String, Object>> list = generatorService.list(tableName);
+        return list;
+    }
+
+    ;
+
+    @RequestMapping("/downLoadCode/{tableName}")
+    public void downLoadCode(HttpServletRequest request, HttpServletResponse response,
+                             @PathVariable("tableName") String tableName) throws IOException {
+        String[] tableNames = new String[]{tableName};
+        byte[] data = generatorService.downloadCode(tableNames);
+        response.reset();
+        response.setHeader("Content-Disposition", "attachment; filename=\"java2nb.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+
+        IOUtils.write(data, response.getOutputStream());
+    }
+
+    @ResponseBody
+    @PostMapping("/genCode")
+    public R genCode(String tableName) {
+        String[] tableNames = new String[]{tableName};
+        generatorService.generatorCode(tableNames);
+        return R.ok("代码生成成功，请到本地项目中查看！");
+    }
+
+    @RequestMapping("/batchDownload")
+    public void batchDownload(HttpServletRequest request, HttpServletResponse response, String tables) throws IOException {
+        String[] tableNames = new String[]{};
+        tableNames = JSON.parseArray(tables).toArray(tableNames);
+        byte[] data = generatorService.downloadCode(tableNames);
+        response.reset();
+        response.setHeader("Content-Disposition", "attachment; filename=\"java2nb.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+
+        IOUtils.write(data, response.getOutputStream());
+    }
+
+    @ResponseBody
+    @PostMapping("/batchCode")
+    public R batchCode(String tables) {
+        String[] tableNames = new String[]{};
+        tableNames = JSON.parseArray(tables).toArray(tableNames);
+        generatorService.generatorCode(tableNames);
+        return R.ok("代码批量生成成功，请到本地项目中查看！");
+    }
+
+    @GetMapping("/edit")
+    public String edit(Model model) {
+        Configuration conf = GenUtils.getConfig();
+        Map<String, Object> property = new HashMap<>(16);
+        property.put("author", conf.getProperty("author"));
+        property.put("email", conf.getProperty("email"));
+        property.put("package", conf.getProperty("package"));
+        property.put("autoRemovePre", conf.getProperty("autoRemovePre"));
+        property.put("tablePrefix", conf.getProperty("tablePrefix"));
+        property.put("srcPath", conf.getProperty("srcPath"));
+        model.addAttribute("property", property);
+        return prefix + "/edit";
+    }
+
+    @ResponseBody
+    @PostMapping("/update")
+    R update(@RequestParam Map<String, Object> map) {
+        try {
+            PropertiesConfiguration conf = new PropertiesConfiguration("generator.properties");
+            conf.setProperty("author", map.get("author"));
+            conf.setProperty("email", map.get("email"));
+            conf.setProperty("package", map.get("package"));
+            conf.setProperty("autoRemovePre", map.get("autoRemovePre"));
+            conf.setProperty("tablePrefix", map.get("tablePrefix"));
+            conf.setProperty("srcPath", map.get("srcPath"));
+            conf.save();
+        } catch (ConfigurationException e) {
+            return R.error("保存配置文件出错");
+        }
+        return R.ok();
+    }
+
+    @GetMapping("/genColumns")
+    String genColumns(String tableName, Model model) {
+        model.addAttribute("tableName", tableName);
+        return "common/genColumns/genColumns";
+    }
+
+
+    @ResponseBody
+    @GetMapping("/genColumns/list")
+    @SneakyThrows
+    public R genColumnsList(String tableName) {
+        List<GenColumnsDO> genColumns = generatorService.listColumnsByTableName(tableName);
+        int total = genColumns.size();
+        PageBean pageBean = new PageBean(genColumns, total);
+        return R.ok().put("data", pageBean);
+    }
+
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @ResponseBody
+    @PostMapping("/genColumns/save")
+    public R save(@RequestBody List<GenColumnsDO> list) {
+        generatorService.genColumnsSave(list);
+        return R.ok();
+    }
+
+
+}

novel-admin/src/main/java/com/java2nb/common/controller/LogController.java

@@ -0,0 +1,57 @@
+package com.java2nb.common.controller;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.java2nb.common.domain.LogDO;
+import com.java2nb.common.domain.PageDO;
+import com.java2nb.common.service.LogService;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+
+@RequestMapping("/common/log")
+@Controller
+public class LogController {
+	@Autowired
+	LogService logService;
+	String prefix = "common/log";
+
+	@GetMapping()
+	String log() {
+		return prefix + "/log";
+	}
+
+	@ResponseBody
+	@GetMapping("/list")
+	PageDO<LogDO> list(@RequestParam Map<String, Object> params) {
+		Query query = new Query(params);
+		PageDO<LogDO> page = logService.queryList(query);
+		return page;
+	}
+	
+	@ResponseBody
+	@PostMapping("/remove")
+	R remove(Long id) {
+		if (logService.remove(id)>0) {
+			return R.ok();
+		}
+		return R.error();
+	}
+
+	@ResponseBody
+	@PostMapping("/batchRemove")
+	R batchRemove(@RequestParam("ids[]") Long[] ids) {
+		int r = logService.batchRemove(ids);
+		if (r > 0) {
+			return R.ok();
+		}
+		return R.error();
+	}
+}

novel-admin/src/main/java/com/java2nb/common/dao/DictDao.java

@@ -0,0 +1,35 @@
+package com.java2nb.common.dao;
+
+import com.java2nb.common.domain.DictDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 字典表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2019-10-03 15:45:42
+ */
+@Mapper
+public interface DictDao {
+
+	DictDO get(Long id);
+
+	List<DictDO> list(Map<String, Object> map);
+
+	int count(Map<String, Object> map);
+
+	int save(DictDO dict);
+
+	int update(DictDO dict);
+
+	int remove(Long id);
+
+	int batchRemove(Long[] ids);
+
+	List<DictDO> listType();
+}