chore: 模版更新

docs: 项目演示
build: 4.0.0 发布
2025-07-01 07:16:39 +00:00 · 2023-04-15 08:37:17 +08:00 · 2023-04-15 08:08:57 +08:00 · 2023-04-15 06:50:55 +08:00 · 2023-04-14 23:22:23 +08:00 · 2023-04-14 23:16:55 +08:00
1466 changed files with 127171 additions and 21483 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,4 +3,5 @@
 **/cachedata
 **/target
 **/*.iml
+**/.DS_Store

--- a/README.md
+++ b/README.md
@ -1,235 +1,88 @@
-[![index]( https://s1.ax1x.com/2020/07/03/NOSA5q.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='http://47.106.243.172:8888'>演示站点</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/'>项目文档（含安装教程）</a>
+</p> 

-https://xiongxyang.gitee.io/home/
+## 项目介绍

-#### 新项目：小说精品屋-微服务版
+novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
+系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、会员充值、订阅模式、新闻发布和实时统计报表。

-基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
+## 项目地址

-GitHub仓库地址： https://github.com/201206030/novel-cloud
+- 学习版：[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)

-Gitee仓库地址： https://gitee.com/novel_dev_team/novel-cloud
-
-#### 演示地址
-
-[点击前往](http://47.106.243.172:8888/)
-
-
-#### 项目介绍
-
-小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、WAP）阅读、功能完善的原创文学CMS系统，由前台门户系统、作家后台管理系统、平台后台管理系统、爬虫管理系统等多个子系统构成，支持会员充值、订阅模式、新闻发布和实时统计报表等功能。
-
-小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
-
- [x] 数据库重新设计，结构调整。
- [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
- [x] 移动站与PC站站点分离，浏览器自动识别跳转。
- [x] PC站UI更新。
- [x] 新闻模块。
- [x] 排行榜。
- [x] 小说评论模块。
- [x] 阅读主题模块。
- [x] 作家专区。
- [x] 充值。
- [x] 订阅。
- [x] 后台管理系统。
- [x] 爬虫管理系统。
-
-#### 项目结构
+## 项目结构

 ```
 novel-plus -- 父工程
 ├── novel-common -- 通用模块
-├── novel-front -- 前台门户&作家后台管理子系统（可拆分）
-├── novel-crawl -- 爬虫管理子系统
-└── novel-admin -- 平台后台管理子系统
+├── novel-front -- 前台门户&作家后台
+├── novel-crawl -- 爬虫
+├── novel-admin -- 管理后台
+└── templates -- 前端模版
 ```

-#### 技术选型
+## 技术选型

-| 技术                 | 说明                                                         
-| -------------------- | ---------------------------
-| SpringBoot           | Spring应用快速开发脚手架     
-| MyBatis              | 持久层ORM框架 
-| MyBatis Dynamic SQL  | Mybatis动态sql
-| PageHelper           | MyBatis分页插件
-| MyBatisGenerator     | 持久层代码生成插件
-| Sharding-Jdbc        | 代码层分库分表中间件
-| JJWT                 | JWT登录支持  
-| SpringSecurity       | 安全框架                           
-| Shiro                | 安全框架  
-| Ehcache              | Java进程内缓存框架(默认缓存)  
-| Redis                | 分布式缓存(缓存替换方案，默认关闭，一行配置开启)                               
-| ElasticSearch        | 搜索引擎(搜索增强方案，默认关闭，一行配置开启)                      
-| RabbitMq             | 消息队列(流量削峰，默认关闭，一行配置开启)  
-| OSS                  | 阿里云对象存储服务(图片存储方式之一，一行配置即可切换) 
-| FastDfs              |开源轻量级分布式文件系统(图片存储方式之一，一行配置即可切换)                      
-| Redisson             | 实现分布式锁                                       
-| Lombok               | 简化对象封装工具                                                                               
-| Docker               | 应用容器引擎   
-| Mysql                | 数据库服务   
-| Thymeleaf            | 模板引擎     
-| Layui                | 前端UI                    
-                 
+| 技术                  | 说明
+|---------------------| ---------------------------
+| 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          | 阿里云对象存储服务(图片存储方式之一，一行配置即可切换)
+| FastDFS             | 开源轻量级分布式文件系统(图片存储方式之一，一行配置即可切换)
+| Lombok              | 简化对象封装工具
+| Docker              | 应用容器引擎
+| MySQL               | 数据库服务
+| Thymeleaf           | 模板引擎
+| Layui               | 前端 UI 框架

-#### 接口文档
+## 项目演示

-[点击查看接口文档示例](./doc/api.md)
+https://www.bilibili.com/video/BV1Zo4y187Mi

-#### PC站截图
+## 增值服务

-1. 首页
+👉 [了解详情](https://novel.xxyopen.com/service.htm)

-![img](https://oscimg.oschina.net/oscnet/up-bbb1c7f72e183327bff754a9fa8bb75223e.png)
+## 微信公众号

-2. 分类索引页
+发布最新更新动态、最新前端模版、最新爬虫规则、文档教程等。

-![img](https://oscimg.oschina.net/oscnet/up-d0b2e03129bfae47b8bb96a491b73d383c5.png)
+![](https://youdoc.github.io/img/qrcode_for_gh.jpg)

-3. 搜索页
-
-![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ20200520-215756.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-ed5f689557718924acac76bc3ebca36afcb.png)
-
-4. 排行榜
-
-![img](https://oscimg.oschina.net/oscnet/up-78d5a68586cd92a86c669311f414508f922.png)
-
-5. 详情页
-
-![img](https://oscimg.oschina.net/oscnet/up-8be2495a2869f93626b0c9c1df6f329747a.png)
-
-6. 阅读页
-
-![img](https://oscimg.oschina.net/oscnet/up-517c84148d2db8e11717a8bbecc57fa1be7.png)
-
-7. 用户中心
-
-![img](https://oscimg.oschina.net/oscnet/up-805a30e7a663a3fd5cb39a7ea26bc132a01.png)
-
-8. 充值
-
-![img](https://oscimg.oschina.net/oscnet/up-5a601b0b3af3224d0bebcfe12fc15075d34.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-face25d02c07b05b2ce954cc4bf4ee6a0cc.png)
-
-9. 作家专区
-
-![img](https://oscimg.oschina.net/oscnet/up-30766372cc7f56480ff1d7d55198204f6ea.png)
-
-![img](https://s3.ax1x.com/2020/11/17/DVFiQI.png)
-
-![img](https://s1.ax1x.com/2020/11/09/B7X5oF.png)
-
-![img](https://s1.ax1x.com/2020/11/09/B7XLsx.png)
-
-10. 购买
-
-![img](https://oscimg.oschina.net/oscnet/up-ce0f585efd82a9670335f118cf5897c85e9.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-f849960f4c1303fea77d26e64fc505a7180.png)
-
-#### 手机站截图
-
-1. 首页
-
-   <img src="https://s3.ax1x.com/2020/12/04/DbsSoj.jpg" alt="index" style="zoom:33%;" />
-
-2. 小说列表页
-
-   <img src="https://s3.ax1x.com/2020/12/04/DbrfsO.jpg" alt="微信图片_20190904181558" style="zoom: 33%;" />
-
-3. 小说详情页
-
-   <img src="https://s3.ax1x.com/2020/12/04/DbsklV.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
-
-4. 小说阅读页
-
-   <img src="https://s3.ax1x.com/2020/12/04/Dbsew4.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
-
-#### 爬虫管理系统截图
-
-![img](https://s1.ax1x.com/2020/11/03/BsOgbD.png)
-
-![img](https://s1.ax1x.com/2020/11/03/BsOHr8.png)
-
-#### 后台管理系统截图
-
-![img](https://oscimg.oschina.net/oscnet/up-0552343538674a22a64819834100558f39b.png)
-
-![img](https://s3.ax1x.com/2020/12/01/DWgLNT.png)
-
-![img](https://s3.ax1x.com/2020/12/01/DfmRCd.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-faf5dda7320674c29a1772bc0c81d74762e.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支持一下 。**
-
-#### 其他安装教程
-
-包安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4272630) 
-
-宝塔安装教程（非官方）：[点击前往](https://www.daniao.org/9166.html) 
-
-docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
-
-#### 代码仓库
-
- GitHub仓库地址： https://github.com/201206030/novel-plus 
-
- Gitee仓库地址： https://gitee.com/novel_dev_team/novel-plus
-
-#### QQ交流群
-
-[点击前往官网查看](https://xiongxyang.gitee.io/home/service.htm)
-
-#### 微信公众号（发布最新更新资讯）
-
-![mini-code](https://s3.ax1x.com/2020/12/03/DoImOx.png)
-
-#### 赞赏支持
+## 赞赏支持

 开源项目不易，若此项目能得到你的青睐，那么你可以赞赏支持作者持续开发与维护。

 - 服务器的费用也是一笔开销
- 为用户提供更好的开发环境
- 一杯咖啡 
+- 编写更完备的文档教程
+- 发布更多前端模版和爬虫规则
+- 一杯咖啡

-![mini-code](https://s1.ax1x.com/2020/10/31/BUQJwq.png)
+![](https://s1.ax1x.com/2020/10/31/BUQJwq.png)

-### 免责声明
+## 免责声明

-本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。
-用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
-
-### 备注
-
-精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
-
-[![index](https://s1.ax1x.com/2020/07/03/NOSuMF.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )
+本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
--- a/doc/api/api.md
+++ b/doc/api/api.md
--- a/doc/es/index_create.txt
+++ b/doc/es/index_create.txt
--- a/doc/sql/20200511.sql
+++ b/doc/sql/20200511.sql
--- a/doc/sql/20200513.sql
+++ b/doc/sql/20200513.sql
--- a/doc/sql/20200518.sql
+++ b/doc/sql/20200518.sql
--- a/doc/sql/20200608.sql
+++ b/doc/sql/20200608.sql
--- a/doc/sql/20200615.sql
+++ b/doc/sql/20200615.sql
--- a/doc/sql/20201103.sql
+++ b/doc/sql/20201103.sql
--- a/doc/sql/20201109.sql
+++ b/doc/sql/20201109.sql
--- a/doc/sql/20201122.sql
+++ b/doc/sql/20201122.sql
--- a/doc/sql/20201201.sql
+++ b/doc/sql/20201201.sql
--- a/doc/sql/20210726.sql
+++ b/doc/sql/20210726.sql
@ -0,0 +1 @@
+alter table news add column `read_count` BIGINT NOT NULL DEFAULT '0' COMMENT '阅读量' after content;
--- a/doc/sql/20210913.sql
+++ b/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 ;
+
+
--- a/doc/sql/20230413.sql
+++ b/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);
--- a/doc/sql/novel_plus.sql
+++ b/doc/sql/novel_plus.sql
--- a/doc/sql/readme.md
+++ b/doc/sql/readme.md
@ -0,0 +1,3 @@
+1. novel_plus.sql 为全量 sql 文件，yyyyMMdd.sql 为增量 sql 文件
+2. 第一次安装只需要执行 novel_plus.sql 文件即可
+3. 后续版本升级需要根据上次代码版本的时间，执行该日期之后的增量 sql 文件（简单来说就是 sql 文件夹中相较于上次多出来的 sql 文件）
--- a/novel-admin/pom.xml
+++ b/novel-admin/pom.xml
@ -5,7 +5,7 @@

    <groupId>com.java2nb</groupId>
    <artifactId>novel-admin</artifactId>
-    <version>3.2.0</version>
+    <version>4.0.0</version>
    <packaging>jar</packaging>

    <name>novel-admin</name>
@ -14,7 +14,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.1.8.RELEASE</version>
        <relativePath/>
    </parent>

@ -24,6 +24,7 @@
        <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>
    </properties>

    <dependencies>
@ -106,7 +107,7 @@
        <dependency>
            <groupId>org.apache.shiro</groupId>
            <artifactId>shiro-spring</artifactId>
-            <version>1.3.2</version>
+            <version>1.7.0</version>
        </dependency>
        <!-- shiro ehcache -->
        <dependency>
@ -195,14 +196,16 @@
            <version>1.4</version>
        </dependency>

-        <!-- ehchache -->
        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>${sharding.jdbc.version}</version>
        </dependency>
+
        <dependency>
-            <groupId>net.sf.ehcache</groupId>
-            <artifactId>ehcache</artifactId>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <version>${sharding.jdbc.version}</version>
        </dependency>

        <!--war包部署需要-->
@ -224,41 +227,97 @@
        <!--<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>
-                <configuration>
-                    <executable>true</executable>
-                </configuration>
-            </plugin>-->
-            <!--SpringBoot项目默认使用spring-boot-maven-plugin，要打成被其他项目引用的jar包，需要更换此插件-->
-            <!-- <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>-->
            <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>
-    <!--<distributionManagement>
+    <repositories>
        <repository>
-            <id>nexus_release</id>
-            <name>release</name>
-            <url>http://47.106.243.172:8081/nexus/content/repositories/releases/</url>
+            <id>ali</id>
+            <url>https://maven.aliyun.com/repository/public</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
        </repository>
-        <snapshotRepository>
-            <id>nexus_snapshots</id>
-            <name>snapshots</name>
-            <url>http://47.106.243.172:8081/nexus/content/repositories/snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>-->
+    </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>
--- a/novel-admin/src/main/build/config/application-prod.yml
+++ b/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
--- a/novel-admin/src/main/build/scripts/novel-admin.sh
+++ b/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
--- a/novel-admin/src/main/java/com/java2nb/AdminApplication.java
+++ b/novel-admin/src/main/java/com/java2nb/AdminApplication.java
@ -1,25 +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.EnableAutoConfiguration;
 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;

-//关闭SpringSecurity的功能
-@EnableAutoConfiguration(exclude = {
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
-})
+import java.net.InetAddress;
+
+
@EnableTransactionManagement
@ServletComponentScan
@MapperScan("com.java2nb.*.dao")
-@SpringBootApplication
+@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"));
+        };
+    }
+
 }
--- a/novel-admin/src/main/java/com/java2nb/common/config/CacheKey.java
+++ b/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";
+}
--- a/novel-admin/src/main/java/com/java2nb/common/config/Constant.java
+++ b/novel-admin/src/main/java/com/java2nb/common/config/Constant.java
@ -1,6 +1,7 @@
 package com.java2nb.common.config;

 public class Constant {
+
    //演示系统账户
    public static String DEMO_ACCOUNT = "test";
    //自动去除表前缀
@ -16,9 +17,11 @@ public class Constant {
    //部门根节点id
    public static Long DEPT_ROOT_ID = 0l;
    //缓存方式
-    public static String CACHE_TYPE_REDIS ="redis";
+    public static String CACHE_TYPE_REDIS = "redis";

    public static String LOG_ERROR = "error";

-    
+    public static final String UPLOAD_FILES_PREFIX = "/files/";
+
+
 }
--- a/novel-admin/src/main/java/com/java2nb/common/config/RedisConfig.java
+++ b/novel-admin/src/main/java/com/java2nb/common/config/RedisConfig.java
@ -1,82 +0,0 @@
-package com.java2nb.common.config;
-
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-@Configuration
-public class RedisConfig {
-
-
-    @Bean
-    @SuppressWarnings("all")
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
-
-
-        RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
-
-
-        template.setConnectionFactory(factory);
-
-
-        Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
-
-
-        ObjectMapper om = new ObjectMapper();
-
-
-        om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
-
-
-        om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
-
-
-        jackson2JsonRedisSerializer.setObjectMapper(om);
-
-
-        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-
-
-        // key采用String的序列化方式
-
-
-        template.setKeySerializer(stringRedisSerializer);
-
-
-        // hash的key也采用String的序列化方式
-
-
-        template.setHashKeySerializer(stringRedisSerializer);
-
-
-        // value序列化方式采用jackson
-
-
-        template.setValueSerializer(jackson2JsonRedisSerializer);
-
-
-        // hash的value序列化方式采用jackson
-
-
-        template.setHashValueSerializer(jackson2JsonRedisSerializer);
-
-
-        template.afterPropertiesSet();
-
-
-        return template;
-
-
-    }
-
-
-}
-
-
--- a/novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java
+++ b/novel-admin/src/main/java/com/java2nb/common/config/ShiroConfig.java
@ -5,11 +5,8 @@ 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 net.sf.ehcache.CacheManager;
-import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.session.SessionListener;
-import org.apache.shiro.session.mgt.eis.MemorySessionDAO;
 import org.apache.shiro.session.mgt.eis.SessionDAO;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
 import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
@ -29,6 +26,7 @@ import java.util.LinkedHashMap;
 */
@Configuration
 public class ShiroConfig {
+
    @Value("${spring.redis.host}")
    private String host;
    @Value("${spring.redis.password}")
@ -38,9 +36,6 @@ public class ShiroConfig {
    @Value("${spring.redis.timeout}")
    private int timeout;

-    @Value("${spring.cache.type}")
-    private String cacheType ;
-
    @Value("${server.session-timeout}")
    private int tomcatTimeout;

@ -67,17 +62,16 @@ public class ShiroConfig {
        shiroFilterFactoryBean.setSuccessUrl("/index");
        shiroFilterFactoryBean.setUnauthorizedUrl("/403");
        LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
-        filterChainDefinitionMap.put("/login","anon");
-        filterChainDefinitionMap.put("/getVerify","anon");
+        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("/docs/**", "anon");
        filterChainDefinitionMap.put("/layuimini/**", "anon");
-        filterChainDefinitionMap.put("/druid/**", "anon");
        filterChainDefinitionMap.put("/upload/**", "anon");
-        filterChainDefinitionMap.put("/files/**", "anon");
+        filterChainDefinitionMap.put(Constant.UPLOAD_FILES_PREFIX + "**", "anon");
        filterChainDefinitionMap.put("/logout", "logout");
        filterChainDefinitionMap.put("/blog", "anon");
        filterChainDefinitionMap.put("/blog/open/**", "anon");
@ -93,11 +87,7 @@ public class ShiroConfig {
        //设置realm.
        securityManager.setRealm(userRealm());
        // 自定义缓存实现 使用redis
-        if (Constant.CACHE_TYPE_REDIS.equals(cacheType)) {
-            securityManager.setCacheManager(rediscacheManager());
-        } else {
-            securityManager.setCacheManager(ehCacheManager());
-        }
+        securityManager.setCacheManager(rediscacheManager());
        securityManager.setSessionManager(sessionManager());
        return securityManager;
    }
@ -109,8 +99,7 @@ public class ShiroConfig {
    }

    /**
-     * 开启shiro aop注解支持.
-     * 使用代理方式;所以需要开启代码支持;
+     * 开启shiro aop注解支持. 使用代理方式;所以需要开启代码支持;
     *
     * @param securityManager
     * @return
@ -139,8 +128,7 @@ public class ShiroConfig {
    }

    /**
-     * cacheManager 缓存 redis实现
-     * 使用的是shiro-redis开源插件
+     * cacheManager 缓存 redis实现 使用的是shiro-redis开源插件
     *
     * @return
     */
@ -152,8 +140,7 @@ public class ShiroConfig {


    /**
-     * RedisSessionDAO shiro sessionDao层的实现 通过redis
-     * 使用的是shiro-redis开源插件
+     * RedisSessionDAO shiro sessionDao层的实现 通过redis 使用的是shiro-redis开源插件
     */
    @Bean
    public RedisSessionDAO redisSessionDAO() {
@ -164,11 +151,7 @@ public class ShiroConfig {

    @Bean
    public SessionDAO sessionDAO() {
-        if (Constant.CACHE_TYPE_REDIS.equals(cacheType)) {
-            return redisSessionDAO();
-        } else {
-            return new MemorySessionDAO();
-        }
+        return redisSessionDAO();
    }

    /**
@ -185,19 +168,4 @@ public class ShiroConfig {
        return sessionManager;
    }

-    @Bean
-    public EhCacheManager ehCacheManager() {
-        EhCacheManager em = new EhCacheManager();
-        em.setCacheManager(cacheManager());
-        return em;
-    }
-
-    @Bean("cacheManager2")
-    CacheManager cacheManager(){
-        return CacheManager.create();
-    }
-
-
-
-
 }
--- a/novel-admin/src/main/java/com/java2nb/common/config/WebConfigurer.java
+++ b/novel-admin/src/main/java/com/java2nb/common/config/WebConfigurer.java
@ -7,11 +7,14 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter

@Component
 class WebConfigurer extends WebMvcConfigurerAdapter {
-	@Autowired
+
+    @Autowired
    JnConfig jnConfig;
-	@Override
-	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		registry.addResourceHandler("/files/**").addResourceLocations("file:///"+ jnConfig.getUploadPath());
-	}
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        registry.addResourceHandler(Constant.UPLOAD_FILES_PREFIX + "**")
+            .addResourceLocations("file:///" + jnConfig.getUploadPath());
+    }

 }
--- a/novel-admin/src/main/java/com/java2nb/common/controller/FileController.java
+++ b/novel-admin/src/main/java/com/java2nb/common/controller/FileController.java
@ -1,12 +1,10 @@
 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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@ -14,7 +12,11 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

-import java.io.*;
+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;
@ -23,7 +25,7 @@ import java.util.Map;

 /**
 * 文件上传
- * 
+ *
 * @author xiongxy
 * @email 1179705413@qq.com
 * @date 2019-09-19 16:02:20
@ -32,165 +34,167 @@ import java.util.Map;
@RequestMapping("/common/sysFile")
 public class FileController extends BaseController {

-	@Autowired
-	private FileService sysFileService;
+    @Autowired
+    private FileService sysFileService;

-	@Autowired
-	private JnConfig jnConfig;
+    @Autowired
+    private JnConfig jnConfig;

-	@GetMapping()
-	@RequiresPermissions("common:sysFile:sysFile")
-	String sysFile(Model model) {
-		Map<String, Object> params = new HashMap<>(16);
-		return "common/file/file";
-	}
+    @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;
-	}
+    @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("/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";
-	}
+    @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);
-	}
+    /**
+     * 信息
+     */
+    @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();
-	}
+    /**
+     * 保存
+     */
+    @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);
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    @RequiresPermissions("common:update")
+    public R update(@RequestBody FileDO sysFile) {
+        sysFileService.update(sysFile);

-		return R.ok();
-	}
+        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("/files/", "");
-		if (sysFileService.remove(id) > 0) {
-			boolean b = FileUtil.deleteFile(fileName);
-			if (!b) {
-				return R.error("数据库记录删除成功，文件删除失败");
-			}
-			return R.ok();
-		} else {
-			return R.error();
-		}
-	}
+    /**
+     * 删除
+     */
+    @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();
-	}
+    /**
+     * 删除
+     */
+    @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);
+    @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), "/files/" + fileDir + fileName, date);
-		try {
-			FileUtil.uploadFile(file.getBytes(), jnConfig.getUploadPath()+fileDir, fileName);
-		} catch (Exception e) {
-			return R.error();
-		}
+        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();
-	}
+        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);
+    /**
+     * 文件下载
+     */
+    @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());
+        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();
-	}
+        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();
+    }


 }
--- a/novel-admin/src/main/java/com/java2nb/common/dao/GeneratorMapper.java
+++ b/novel-admin/src/main/java/com/java2nb/common/dao/GeneratorMapper.java
@ -1,28 +1,33 @@
 package com.java2nb.common.dao;

-import java.util.List;
-import java.util.Map;
-
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

+import java.util.List;
+import java.util.Map;
+
 public interface GeneratorMapper {
-	@Select("select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables"
-			+ " where table_schema = (select database()) and table_name like concat('%',#{tableName},'%')")
-	List<Map<String, Object>> list(@Param("tableName") String tableName);

-	@Select("select count(*) from information_schema.tables where table_schema = (select database())")
-	int count(Map<String, Object> map);
+    @Select(
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables"
+            + " where table_schema = 'novel_plus' and table_name like concat('%',#{tableName},'%')")
+    List<Map<String, Object>> list(@Param("tableName") String tableName);

-	@Select("select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables \r\n"
-			+ "	where table_schema = (select database()) and table_name = #{tableName}")
-	Map<String, String> get(String tableName);
+    @Select("select count(*) from information_schema.tables where table_schema = 'novel_plus'")
+    int count(Map<String, Object> map);

-	@Select("select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
-			+ " where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position")
-	List<Map<String, String>> listColumns(String tableName);
+    @Select(
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables \r\n"
+            + "	where table_schema = 'novel_plus' and table_name = #{tableName}")
+    Map<String, String> get(String tableName);

-	@Select("select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
-			+ " where table_name = #{tableName} and table_schema = (select database()) and column_key = 'PRI' limit 1")
+    @Select(
+        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
+            + " where table_name = #{tableName} and table_schema = 'novel_plus' order by ordinal_position")
+    List<Map<String, String>> listColumns(String tableName);
+
+    @Select(
+        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
+            + " where table_name = #{tableName} and table_schema = 'novel_plus' and column_key = 'PRI' limit 1")
    Map<String, String> getPriColumn(String tableName);
 }
--- a/novel-admin/src/main/java/com/java2nb/common/domain/DictDO.java
+++ b/novel-admin/src/main/java/com/java2nb/common/domain/DictDO.java
@ -3,219 +3,270 @@ package com.java2nb.common.domain;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-
+import java.util.Objects;


 /**
 * 字典表
- * 
+ *
 * @author xiongxy
 * @email 1179705413@qq.com
 * @date 2019-09-29 18:28:07
 */
 public class DictDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	//编号
-	private Long id;
-	//标签名
-	private String name;
-	//数据值
-	private String value;
-	//类型
-	private String type;
-	//描述
-	private String description;
-	//排序（升序）
-	private BigDecimal sort;
-	//父级编号
-	private Long parentId;
-	//创建者
-	private Integer createBy;
-	//创建时间
-	private Date createDate;
-	//更新者
-	private Long updateBy;
-	//更新时间
-	private Date updateDate;
-	//备注信息
-	private String remarks;
-	//删除标记
-	private String delFlag;

-	/**
-	 * 设置：编号
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：编号
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：标签名
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	/**
-	 * 获取：标签名
-	 */
-	public String getName() {
-		return name;
-	}
-	/**
-	 * 设置：数据值
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-	/**
-	 * 获取：数据值
-	 */
-	public String getValue() {
-		return value;
-	}
-	/**
-	 * 设置：类型
-	 */
-	public void setType(String type) {
-		this.type = type;
-	}
-	/**
-	 * 获取：类型
-	 */
-	public String getType() {
-		return type;
-	}
-	/**
-	 * 设置：描述
-	 */
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	/**
-	 * 获取：描述
-	 */
-	public String getDescription() {
-		return description;
-	}
-	/**
-	 * 设置：排序（升序）
-	 */
-	public void setSort(BigDecimal sort) {
-		this.sort = sort;
-	}
-	/**
-	 * 获取：排序（升序）
-	 */
-	public BigDecimal getSort() {
-		return sort;
-	}
-	/**
-	 * 设置：父级编号
-	 */
-	public void setParentId(Long parentId) {
-		this.parentId = parentId;
-	}
-	/**
-	 * 获取：父级编号
-	 */
-	public Long getParentId() {
-		return parentId;
-	}
-	/**
-	 * 设置：创建者
-	 */
-	public void setCreateBy(Integer createBy) {
-		this.createBy = createBy;
-	}
-	/**
-	 * 获取：创建者
-	 */
-	public Integer getCreateBy() {
-		return createBy;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateDate(Date createDate) {
-		this.createDate = createDate;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateDate() {
-		return createDate;
-	}
-	/**
-	 * 设置：更新者
-	 */
-	public void setUpdateBy(Long updateBy) {
-		this.updateBy = updateBy;
-	}
-	/**
-	 * 获取：更新者
-	 */
-	public Long getUpdateBy() {
-		return updateBy;
-	}
-	/**
-	 * 设置：更新时间
-	 */
-	public void setUpdateDate(Date updateDate) {
-		this.updateDate = updateDate;
-	}
-	/**
-	 * 获取：更新时间
-	 */
-	public Date getUpdateDate() {
-		return updateDate;
-	}
-	/**
-	 * 设置：备注信息
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks;
-	}
-	/**
-	 * 获取：备注信息
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-	/**
-	 * 设置：删除标记
-	 */
-	public void setDelFlag(String delFlag) {
-		this.delFlag = delFlag;
-	}
-	/**
-	 * 获取：删除标记
-	 */
-	public String getDelFlag() {
-		return delFlag;
-	}
+    private static final long serialVersionUID = 1L;

-	@Override
-	public String toString() {
-		return "DictDO{" +
-				"id=" + id +
-				", name='" + name + '\'' +
-				", value='" + value + '\'' +
-				", type='" + type + '\'' +
-				", description='" + description + '\'' +
-				", sort=" + sort +
-				", parentId=" + parentId +
-				", createBy=" + createBy +
-				", createDate=" + createDate +
-				", updateBy=" + updateBy +
-				", updateDate=" + updateDate +
-				", remarks='" + remarks + '\'' +
-				", delFlag='" + delFlag + '\'' +
-				'}';
-	}
+    //编号
+    private Long id;
+    //标签名
+    private String name;
+    //数据值
+    private String value;
+    //类型
+    private String type;
+    //描述
+    private String description;
+    //排序（升序）
+    private BigDecimal sort;
+    //父级编号
+    private Long parentId;
+    //创建者
+    private Integer createBy;
+    //创建时间
+    private Date createDate;
+    //更新者
+    private Long updateBy;
+    //更新时间
+    private Date updateDate;
+    //备注信息
+    private String remarks;
+    //删除标记
+    private String delFlag;
+
+    /**
+     * 设置：编号
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：编号
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：标签名
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取：标签名
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置：数据值
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * 获取：数据值
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 设置：类型
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取：类型
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * 设置：描述
+     */
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * 获取：描述
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 设置：排序（升序）
+     */
+    public void setSort(BigDecimal sort) {
+        this.sort = sort;
+    }
+
+    /**
+     * 获取：排序（升序）
+     */
+    public BigDecimal getSort() {
+        return sort;
+    }
+
+    /**
+     * 设置：父级编号
+     */
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    /**
+     * 获取：父级编号
+     */
+    public Long getParentId() {
+        return parentId;
+    }
+
+    /**
+     * 设置：创建者
+     */
+    public void setCreateBy(Integer createBy) {
+        this.createBy = createBy;
+    }
+
+    /**
+     * 获取：创建者
+     */
+    public Integer getCreateBy() {
+        return createBy;
+    }
+
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * 设置：更新者
+     */
+    public void setUpdateBy(Long updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    /**
+     * 获取：更新者
+     */
+    public Long getUpdateBy() {
+        return updateBy;
+    }
+
+    /**
+     * 设置：更新时间
+     */
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * 获取：更新时间
+     */
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * 设置：备注信息
+     */
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    /**
+     * 获取：备注信息
+     */
+    public String getRemarks() {
+        return remarks;
+    }
+
+    /**
+     * 设置：删除标记
+     */
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    /**
+     * 获取：删除标记
+     */
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public String toString() {
+        return "DictDO{" +
+            "id=" + id +
+            ", name='" + name + '\'' +
+            ", value='" + value + '\'' +
+            ", type='" + type + '\'' +
+            ", description='" + description + '\'' +
+            ", sort=" + sort +
+            ", parentId=" + parentId +
+            ", createBy=" + createBy +
+            ", createDate=" + createDate +
+            ", updateBy=" + updateBy +
+            ", updateDate=" + updateDate +
+            ", remarks='" + remarks + '\'' +
+            ", delFlag='" + delFlag + '\'' +
+            '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DictDO dictDO = (DictDO) o;
+        return Objects.equals(id, dictDO.id) && Objects.equals(name, dictDO.name)
+            && Objects.equals(value, dictDO.value) && Objects.equals(type, dictDO.type)
+            && Objects.equals(description, dictDO.description) && Objects.equals(sort, dictDO.sort)
+            && Objects.equals(parentId, dictDO.parentId) && Objects.equals(createBy, dictDO.createBy)
+            && Objects.equals(createDate, dictDO.createDate) && Objects.equals(updateBy,
+            dictDO.updateBy) && Objects.equals(updateDate, dictDO.updateDate) && Objects.equals(remarks,
+            dictDO.remarks) && Objects.equals(delFlag, dictDO.delFlag);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, value, type, description, sort, parentId, createBy, createDate, updateBy,
+            updateDate,
+            remarks, delFlag);
+    }
 }
--- a/novel-admin/src/main/java/com/java2nb/common/service/impl/DictServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/common/service/impl/DictServiceImpl.java
@ -1,5 +1,8 @@
 package com.java2nb.common.service.impl;

+import com.java2nb.common.dao.DictDao;
+import com.java2nb.common.domain.DictDO;
+import com.java2nb.common.service.DictService;
 import com.java2nb.common.utils.StringUtils;
 import com.java2nb.system.domain.UserDO;
 import org.springframework.beans.factory.annotation.Autowired;
@ -9,14 +12,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-
-import com.java2nb.common.dao.DictDao;
-import com.java2nb.common.domain.DictDO;
-import com.java2nb.common.service.DictService;
+import java.util.stream.Collectors;


@Service
 public class DictServiceImpl implements DictService {
+
    @Autowired
    private DictDao dictDao;

@ -58,7 +59,7 @@ public class DictServiceImpl implements DictService {
    @Override

    public List<DictDO> listType() {
-        return dictDao.listType();
+        return dictDao.listType().stream().distinct().collect(Collectors.toList());
    }

    @Override
--- a/novel-admin/src/main/java/com/java2nb/common/service/impl/FileServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/common/service/impl/FileServiceImpl.java
@ -1,72 +1,74 @@
 package com.java2nb.common.service.impl;

+import com.java2nb.common.config.Constant;
 import com.java2nb.common.config.JnConfig;
+import com.java2nb.common.dao.FileDao;
+import com.java2nb.common.domain.FileDO;
+import com.java2nb.common.service.FileService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;

 import java.io.File;
 import java.util.List;
 import java.util.Map;

-import com.java2nb.common.dao.FileDao;
-import com.java2nb.common.domain.FileDO;
-import com.java2nb.common.service.FileService;
-import org.springframework.util.StringUtils;
-

@Service
 public class FileServiceImpl implements FileService {
-	@Autowired
-	private FileDao sysFileMapper;

-	@Autowired
-	private JnConfig jnConfig;
-	@Override
-	public FileDO get(Long id){
-		return sysFileMapper.get(id);
-	}
-	
-	@Override
-	public List<FileDO> list(Map<String, Object> map){
-		return sysFileMapper.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return sysFileMapper.count(map);
-	}
-	
-	@Override
-	public int save(FileDO sysFile){
-		return sysFileMapper.save(sysFile);
-	}
-	
-	@Override
-	public int update(FileDO sysFile){
-		return sysFileMapper.update(sysFile);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return sysFileMapper.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return sysFileMapper.batchRemove(ids);
-	}
+    @Autowired
+    private FileDao sysFileMapper;
+
+    @Autowired
+    private JnConfig jnConfig;
+
+    @Override
+    public FileDO get(Long id) {
+        return sysFileMapper.get(id);
+    }
+
+    @Override
+    public List<FileDO> list(Map<String, Object> map) {
+        return sysFileMapper.list(map);
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return sysFileMapper.count(map);
+    }
+
+    @Override
+    public int save(FileDO sysFile) {
+        return sysFileMapper.save(sysFile);
+    }
+
+    @Override
+    public int update(FileDO sysFile) {
+        return sysFileMapper.update(sysFile);
+    }
+
+    @Override
+    public int remove(Long id) {
+        return sysFileMapper.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return sysFileMapper.batchRemove(ids);
+    }

    @Override
    public Boolean isExist(String url) {
-		Boolean isExist = false;
-		if (!StringUtils.isEmpty(url)) {
-			String filePath = url.replace("/files/", "");
-			filePath = jnConfig.getUploadPath() + filePath;
-			File file = new File(filePath);
-			if (file.exists()) {
-				isExist = true;
-			}
-		}
-		return isExist;
-	}
-	}
+        Boolean isExist = false;
+        if (!StringUtils.isEmpty(url)) {
+            String filePath = url.replace(Constant.UPLOAD_FILES_PREFIX, "");
+            filePath = jnConfig.getUploadPath() + filePath;
+            File file = new File(filePath);
+            if (file.exists()) {
+                isExist = true;
+            }
+        }
+        return isExist;
+    }
+}
--- a/novel-admin/src/main/java/com/java2nb/common/utils/RedisUtil.java
+++ b/novel-admin/src/main/java/com/java2nb/common/utils/RedisUtil.java
@ -1,601 +0,0 @@
-package com.java2nb.common.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-@Component
-@Slf4j
-public final class RedisUtil {
-
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
-    /**
-     * 指定缓存失效时间
-     *
-     * @param key  键
-     * @param time 时间(秒)
-     * @return
-     */
-
-
-    public boolean expire(String key, long time) {
-        try {
-            if (time > 0) {
-                redisTemplate.expire(key, time, TimeUnit.SECONDS);
-            }
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 根据key 获取过期时间
-     *
-     * @param key 键 不能为null
-     * @return 时间(秒) 返回0代表为永久有效
-     */
-
-
-    public long getExpire(String key) {
-        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
-    }
-
-
-    /**
-     * 判断key是否存在
-     *
-     * @param key 键
-     * @return true 存在 false不存在
-     */
-
-
-    public boolean hasKey(String key) {
-        try {
-            return redisTemplate.hasKey(key);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 删除缓存
-     *
-     * @param key 可以传一个值 或多个
-     */
-    public void del(String... key) {
-        if (key != null && key.length > 0) {
-            if (key.length == 1) {
-                redisTemplate.delete(key[0]);
-            } else {
-                redisTemplate.delete(CollectionUtils.arrayToList(key));
-            }
-        }
-    }
-
-    /**
-     * 普通缓存获取
-     *
-     * @param key 键
-     * @return 值
-     */
-    public Object get(String key) {
-        return key == null ? null : redisTemplate.opsForValue().get(key);
-    }
-
-
-    /**
-     * 普通缓存放入
-     *
-     * @param key   键
-     * @param value 值
-     * @return true成功 false失败
-     */
-    public boolean set(String key, Object value) {
-        try {
-            redisTemplate.opsForValue().set(key, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 普通缓存放入并设置时间
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
-     * @return true成功 false 失败
-     */
-    public boolean set(String key, Object value, long time) {
-        try {
-            if (time > 0) {
-                redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
-            } else {
-                set(key, value);
-            }
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 递增
-     *
-     * @param key   键
-     * @param delta 要增加几(大于0)
-     * @return
-     */
-    public long incr(String key, long delta) {
-        if (delta < 0) {
-            throw new RuntimeException("递增因子必须大于0");
-        }
-        return redisTemplate.opsForValue().increment(key, delta);
-    }
-
-
-    /**
-     * 递减
-     *
-     * @param key   键
-     * @param delta 要减少几(小于0)
-     * @return
-     */
-    public long decr(String key, long delta) {
-        if (delta < 0) {
-            throw new RuntimeException("递减因子必须大于0");
-        }
-        return redisTemplate.opsForValue().increment(key, -delta);
-    }
-
-
-    // ================================Map=================================
-
-
-    /**
-     * HashGet
-     *
-     * @param key  键 不能为null
-     * @param item 项 不能为null
-     * @return 值
-     */
-    public Object hget(String key, String item) {
-        return redisTemplate.opsForHash().get(key, item);
-    }
-
-
-    /**
-     * 获取hashKey对应的所有键值
-     *
-     * @param key 键
-     * @return 对应的多个键值
-     */
-    public Map<Object, Object> hmget(String key) {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-
-    /**
-     * HashSet
-     *
-     * @param key 键
-     * @param map 对应多个键值
-     * @return true 成功 false 失败
-     */
-    public boolean hmset(String key, Map<String, Object> map) {
-        try {
-            redisTemplate.opsForHash().putAll(key, map);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * HashSet 并设置时间
-     *
-     * @param key  键
-     * @param map  对应多个键值
-     * @param time 时间(秒)
-     * @return true成功 false失败
-     */
-    public boolean hmset(String key, Map<String, Object> map, long time) {
-        try {
-            redisTemplate.opsForHash().putAll(key, map);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 向一张hash表中放入数据,如果不存在将创建
-     *
-     * @param key   键
-     * @param item  项
-     * @param value 值
-     * @return true 成功 false失败
-     */
-    public boolean hset(String key, String item, Object value) {
-        try {
-            redisTemplate.opsForHash().put(key, item, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 向一张hash表中放入数据,如果不存在将创建
-     *
-     * @param key   键
-     * @param item  项
-     * @param value 值
-     * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
-     * @return true 成功 false失败
-     */
-    public boolean hset(String key, String item, Object value, long time) {
-        try {
-            redisTemplate.opsForHash().put(key, item, value);
-            if (time > 0) {
-                expire(key, time);
-            }
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 删除hash表中的值
-     *
-     * @param key  键 不能为null
-     * @param item 项 可以使多个 不能为null
-     */
-
-
-    public void hdel(String key, Object... item) {
-        redisTemplate.opsForHash().delete(key, item);
-    }
-
-
-    /**
-     * 判断hash表中是否有该项的值
-     *
-     * @param key  键 不能为null
-     * @param item 项 不能为null
-     * @return true 存在 false不存在
-     */
-    public boolean hHasKey(String key, String item) {
-        return redisTemplate.opsForHash().hasKey(key, item);
-    }
-
-
-    /**
-     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
-     *
-     * @param key  键
-     * @param item 项
-     * @param by   要增加几(大于0)
-     * @return
-     */
-    public double hincr(String key, String item, double by) {
-        return redisTemplate.opsForHash().increment(key, item, by);
-    }
-
-
-    /**
-     * hash递减
-     *
-     * @param key  键
-     * @param item 项
-     * @param by   要减少记(小于0)
-     * @return
-     */
-    public double hdecr(String key, String item, double by) {
-        return redisTemplate.opsForHash().increment(key, item, -by);
-    }
-
-
-    /**
-     * 根据key获取Set中的所有值
-     *
-     * @param key 键
-     * @return
-     */
-    public Set<Object> sGet(String key) {
-        try {
-            return redisTemplate.opsForSet().members(key);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return null;
-        }
-    }
-
-
-    /**
-     * 根据value从一个set中查询,是否存在
-     *
-     * @param key   键
-     * @param value 值
-     * @return true 存在 false不存在
-     */
-    public boolean sHasKey(String key, Object value) {
-        try {
-            return redisTemplate.opsForSet().isMember(key, value);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 将数据放入set缓存
-     *
-     * @param key    键
-     * @param values 值 可以是多个
-     * @return 成功个数
-     */
-    public long sSet(String key, Object... values) {
-        try {
-            return redisTemplate.opsForSet().add(key, values);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return 0;
-        }
-    }
-
-
-    /**
-     * 将set数据放入缓存
-     *
-     * @param key    键
-     * @param time   时间(秒)
-     * @param values 值 可以是多个
-     * @return 成功个数
-     */
-    public long sSetAndTime(String key, long time, Object... values) {
-        try {
-            Long count = redisTemplate.opsForSet().add(key, values);
-            if (time > 0)
-                expire(key, time);
-            return count;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return 0;
-        }
-    }
-
-
-    /**
-     * 获取set缓存的长度
-     *
-     * @param key 键
-     * @return
-     */
-    public long sGetSetSize(String key) {
-        try {
-            return redisTemplate.opsForSet().size(key);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return 0;
-        }
-    }
-
-
-    /**
-     * 移除值为value的
-     *
-     * @param key    键
-     * @param values 值 可以是多个
-     * @return 移除的个数
-     */
-    public long setRemove(String key, Object... values) {
-        try {
-            Long count = redisTemplate.opsForSet().remove(key, values);
-            return count;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return 0;
-        }
-    }
-
-
-    /**
-     * 获取list缓存的内容
-     *
-     * @param key   键
-     * @param start 开始
-     * @param end   结束 0 到 -代表所有值
-     * @return
-     */
-    public List<Object> lGet(String key, long start, long end) {
-        try {
-            return redisTemplate.opsForList().range(key, start, end);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return null;
-        }
-    }
-
-
-    /**
-     * 获取list缓存的长度
-     *
-     * @param key 键
-     * @return
-     */
-    public long lGetListSize(String key) {
-        try {
-            return redisTemplate.opsForList().size(key);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return 0;
-        }
-    }
-
-
-    /**
-     * 通过索引 获取list中的值
-     *
-     * @param key   键
-     * @param index 索引 index>=0时， 0 表头， 第二个元素，依次类推；index<0时，-，表尾，-倒数第二个元素，依次类推
-     * @return
-     */
-    public Object lGetIndex(String key, long index) {
-        try {
-            return redisTemplate.opsForList().index(key, index);
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return null;
-        }
-    }
-
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    public boolean lSet(String key, Object value) {
-        try {
-            redisTemplate.opsForList().rightPush(key, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒)
-     * @return
-     */
-    public boolean lSet(String key, Object value, long time) {
-        try {
-            redisTemplate.opsForList().rightPush(key, value);
-            if (time > 0)
-                expire(key, time);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @return
-     */
-    public boolean lSet(String key, List<Object> value) {
-        try {
-            redisTemplate.opsForList().rightPushAll(key, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 将list放入缓存
-     *
-     * @param key   键
-     * @param value 值
-     * @param time  时间(秒)
-     * @return
-     */
-    public boolean lSet(String key, List<Object> value, long time) {
-        try {
-            redisTemplate.opsForList().rightPushAll(key, value);
-            if (time > 0)
-                expire(key, time);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 根据索引修改list中的某条数据
-     *
-     * @param key   键
-     * @param index 索引
-     * @param value 值
-     * @return
-     */
-    public boolean lUpdateIndex(String key, long index, Object value) {
-        try {
-            redisTemplate.opsForList().set(key, index, value);
-            return true;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return false;
-        }
-    }
-
-
-    /**
-     * 移除N个值为value
-     *
-     * @param key   键
-     * @param count 移除多少个
-     * @param value 值
-     * @return 移除的个数
-     */
-    public long lRemove(String key, long count, Object value) {
-        try {
-            Long remove = redisTemplate.opsForList().remove(key, count, value);
-            return remove;
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            return 0;
-        }
-    }
-}
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/BookCommentController.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/controller/BookCommentController.java
@ -0,0 +1,135 @@
+package com.java2nb.novel.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import io.swagger.annotations.ApiOperation;
+
+
+import com.java2nb.novel.domain.BookCommentDO;
+import com.java2nb.novel.service.BookCommentService;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+
+/**
+ * 小说评论表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 21:59:28
+ */
+
+@Controller
+@RequestMapping("/novel/bookComment")
+public class BookCommentController {
+    @Autowired
+    private BookCommentService bookCommentService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:bookComment:bookComment")
+    String BookComment() {
+        return "novel/bookComment/bookComment";
+    }
+
+    @ApiOperation(value = "获取小说评论表列表", notes = "获取小说评论表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:bookComment:bookComment")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<BookCommentDO> bookCommentList = bookCommentService.list(query);
+        int total = bookCommentService.count(query);
+        PageBean pageBean = new PageBean(bookCommentList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增小说评论表页面", notes = "新增小说评论表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:bookComment:add")
+    String add() {
+        return "novel/bookComment/add";
+    }
+
+    @ApiOperation(value = "修改小说评论表页面", notes = "修改小说评论表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:bookComment:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            BookCommentDO bookComment = bookCommentService.get(id);
+        model.addAttribute("bookComment", bookComment);
+        return "novel/bookComment/edit";
+    }
+
+    @ApiOperation(value = "查看小说评论表页面", notes = "查看小说评论表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:bookComment:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			BookCommentDO bookComment = bookCommentService.get(id);
+        model.addAttribute("bookComment", bookComment);
+        return "novel/bookComment/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增小说评论表", notes = "新增小说评论表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:bookComment:add")
+    public R save( BookCommentDO bookComment) {
+        if (bookCommentService.save(bookComment) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改小说评论表", notes = "修改小说评论表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:bookComment:edit")
+    public R update( BookCommentDO bookComment) {
+            bookCommentService.update(bookComment);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除小说评论表", notes = "删除小说评论表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookComment:remove")
+    public R remove( Long id) {
+        if (bookCommentService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除小说评论表", notes = "批量删除小说评论表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookComment:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            bookCommentService.batchRemove(ids);
+        return R.ok();
+    }
+
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/BookContentController.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/controller/BookContentController.java
@ -0,0 +1,135 @@
+package com.java2nb.novel.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import io.swagger.annotations.ApiOperation;
+
+
+import com.java2nb.novel.domain.BookContentDO;
+import com.java2nb.novel.service.BookContentService;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+
+/**
+ * 小说内容表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:52:06
+ */
+
+@Controller
+@RequestMapping("/novel/bookContent")
+public class BookContentController {
+    @Autowired
+    private BookContentService bookContentService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:bookContent:bookContent")
+    String BookContent() {
+        return "novel/bookContent/bookContent";
+    }
+
+    @ApiOperation(value = "获取小说内容表列表", notes = "获取小说内容表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:bookContent:bookContent")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<BookContentDO> bookContentList = bookContentService.list(query);
+        int total = bookContentService.count(query);
+        PageBean pageBean = new PageBean(bookContentList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增小说内容表页面", notes = "新增小说内容表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:bookContent:add")
+    String add() {
+        return "novel/bookContent/add";
+    }
+
+    @ApiOperation(value = "修改小说内容表页面", notes = "修改小说内容表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:bookContent:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            BookContentDO bookContent = bookContentService.get(id);
+        model.addAttribute("bookContent", bookContent);
+        return "novel/bookContent/edit";
+    }
+
+    @ApiOperation(value = "查看小说内容表页面", notes = "查看小说内容表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:bookContent:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			BookContentDO bookContent = bookContentService.get(id);
+        model.addAttribute("bookContent", bookContent);
+        return "novel/bookContent/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增小说内容表", notes = "新增小说内容表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:bookContent:add")
+    public R save( BookContentDO bookContent) {
+        if (bookContentService.save(bookContent) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改小说内容表", notes = "修改小说内容表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:bookContent:edit")
+    public R update( BookContentDO bookContent) {
+            bookContentService.update(bookContent);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除小说内容表", notes = "删除小说内容表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookContent:remove")
+    public R remove( Long id) {
+        if (bookContentService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除小说内容表", notes = "批量删除小说内容表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookContent:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            bookContentService.batchRemove(ids);
+        return R.ok();
+    }
+
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/BookIndexController.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/controller/BookIndexController.java
@ -0,0 +1,135 @@
+package com.java2nb.novel.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import io.swagger.annotations.ApiOperation;
+
+
+import com.java2nb.novel.domain.BookIndexDO;
+import com.java2nb.novel.service.BookIndexService;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+
+/**
+ * 小说目录表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:51:54
+ */
+
+@Controller
+@RequestMapping("/novel/bookIndex")
+public class BookIndexController {
+    @Autowired
+    private BookIndexService bookIndexService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:bookIndex:bookIndex")
+    String BookIndex() {
+        return "novel/bookIndex/bookIndex";
+    }
+
+    @ApiOperation(value = "获取小说目录表列表", notes = "获取小说目录表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:bookIndex:bookIndex")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<BookIndexDO> bookIndexList = bookIndexService.list(query);
+        int total = bookIndexService.count(query);
+        PageBean pageBean = new PageBean(bookIndexList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增小说目录表页面", notes = "新增小说目录表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:bookIndex:add")
+    String add() {
+        return "novel/bookIndex/add";
+    }
+
+    @ApiOperation(value = "修改小说目录表页面", notes = "修改小说目录表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:bookIndex:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            BookIndexDO bookIndex = bookIndexService.get(id);
+        model.addAttribute("bookIndex", bookIndex);
+        return "novel/bookIndex/edit";
+    }
+
+    @ApiOperation(value = "查看小说目录表页面", notes = "查看小说目录表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:bookIndex:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			BookIndexDO bookIndex = bookIndexService.get(id);
+        model.addAttribute("bookIndex", bookIndex);
+        return "novel/bookIndex/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增小说目录表", notes = "新增小说目录表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:bookIndex:add")
+    public R save( BookIndexDO bookIndex) {
+        if (bookIndexService.save(bookIndex) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改小说目录表", notes = "修改小说目录表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:bookIndex:edit")
+    public R update( BookIndexDO bookIndex) {
+            bookIndexService.update(bookIndex);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除小说目录表", notes = "删除小说目录表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookIndex:remove")
+    public R remove( Long id) {
+        if (bookIndexService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除小说目录表", notes = "批量删除小说目录表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:bookIndex:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            bookIndexService.batchRemove(ids);
+        return R.ok();
+    }
+
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/FriendLinkController.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/controller/FriendLinkController.java
@ -0,0 +1,135 @@
+package com.java2nb.novel.controller;
+
+import com.java2nb.common.config.CacheKey;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
+import com.java2nb.novel.domain.FriendLinkDO;
+import com.java2nb.novel.service.FriendLinkService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 15:12:25
+ */
+
+@Controller
+@RequestMapping("/novel/friendLink")
+public class FriendLinkController {
+
+    @Autowired
+    private FriendLinkService friendLinkService;
+    @Autowired
+    private RedisTemplate<Object, Object> redisTemplate;
+
+    @GetMapping()
+    @RequiresPermissions("novel:friendLink:friendLink")
+    String FriendLink() {
+        return "novel/friendLink/friendLink";
+    }
+
+    @ApiOperation(value = "获取列表", notes = "获取列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:friendLink:friendLink")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<FriendLinkDO> friendLinkList = friendLinkService.list(query);
+        int total = friendLinkService.count(query);
+        PageBean pageBean = new PageBean(friendLinkList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增页面", notes = "新增页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:friendLink:add")
+    String add() {
+        return "novel/friendLink/add";
+    }
+
+    @ApiOperation(value = "修改页面", notes = "修改页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:friendLink:edit")
+    String edit(@PathVariable("id") Integer id, Model model) {
+        FriendLinkDO friendLink = friendLinkService.get(id);
+        model.addAttribute("friendLink", friendLink);
+        return "novel/friendLink/edit";
+    }
+
+    @ApiOperation(value = "查看页面", notes = "查看页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:friendLink:detail")
+    String detail(@PathVariable("id") Integer id, Model model) {
+        FriendLinkDO friendLink = friendLinkService.get(id);
+        model.addAttribute("friendLink", friendLink);
+        return "novel/friendLink/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:friendLink:add")
+    public R save(FriendLinkDO friendLink) {
+        if (friendLinkService.save(friendLink) > 0) {
+            redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:friendLink:edit")
+    public R update(FriendLinkDO friendLink) {
+        friendLinkService.update(friendLink);
+        redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除", notes = "删除")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:friendLink:remove")
+    public R remove(Integer id) {
+        if (friendLinkService.remove(id) > 0) {
+            redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除", notes = "批量删除")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:friendLink:batchRemove")
+    public R remove(@RequestParam("ids[]") Integer[] ids) {
+        friendLinkService.batchRemove(ids);
+        redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
+        return R.ok();
+    }
+
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/StatController.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/controller/StatController.java
@ -1,19 +1,17 @@
 package com.java2nb.novel.controller;

 import com.java2nb.common.utils.DateUtils;
-import com.java2nb.common.utils.PageBean;
-import com.java2nb.common.utils.Query;
 import com.java2nb.common.utils.R;
-import com.java2nb.novel.domain.AuthorCodeDO;
-import com.java2nb.novel.service.*;
-import com.java2nb.test.service.OrderService;
-import io.swagger.annotations.ApiOperation;
+import com.java2nb.novel.service.AuthorService;
+import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.PayService;
+import com.java2nb.novel.service.UserService;
 import lombok.SneakyThrows;
-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.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;

 import java.text.SimpleDateFormat;
 import java.util.Date;
--- a/novel-admin/src/main/java/com/java2nb/novel/controller/WebsiteInfoController.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/controller/WebsiteInfoController.java
@ -0,0 +1,50 @@
+package com.java2nb.novel.controller;
+
+import com.java2nb.common.utils.R;
+import com.java2nb.novel.domain.WebsiteInfoDO;
+import com.java2nb.novel.service.WebsiteInfoService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * 网站信息表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 11:05:43
+ */
+
+@Controller
+@RequestMapping("/novel/websiteInfo")
+public class WebsiteInfoController {
+
+    @Autowired
+    private WebsiteInfoService websiteInfoService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:websiteInfo:detail")
+    String detail(Model model) {
+        WebsiteInfoDO websiteInfo = websiteInfoService.get(1L);
+        model.addAttribute("websiteInfo", websiteInfo);
+        return "novel/websiteInfo/detail";
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改网站信息表", notes = "修改网站信息表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:websiteInfo:edit")
+    public R update(WebsiteInfoDO websiteInfo) {
+        websiteInfoService.update(websiteInfo);
+        return R.ok();
+    }
+
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/BookCommentDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/BookCommentDao.java
@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.BookCommentDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 小说评论表
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 21:59:28
+ */
+@Mapper
+public interface BookCommentDao {
+
+	BookCommentDO get(Long id);
+	
+	List<BookCommentDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(BookCommentDO bookComment);
+	
+	int update(BookCommentDO bookComment);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/BookContentDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/BookContentDao.java
@ -0,0 +1,34 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.BookContentDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小说内容表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:52:06
+ */
+@Mapper
+public interface BookContentDao {
+
+    BookContentDO get(Long id);
+
+    List<BookContentDO> list(Map<String, Object> map);
+
+    int count(Map<String, Object> map);
+
+    int save(BookContentDO bookContent);
+
+    int update(BookContentDO bookContent);
+
+    int remove(Long id);
+
+    int batchRemove(Long[] ids);
+
+    int removeByIndexIds(Long[] indexIds);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/BookDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/BookDao.java
@ -1,15 +1,15 @@
 package com.java2nb.novel.dao;

 import com.java2nb.novel.domain.BookDO;
+import org.apache.ibatis.annotations.Mapper;

 import java.util.Date;
 import java.util.List;
 import java.util.Map;

-import org.apache.ibatis.annotations.Mapper;
-
 /**
 * 小说表
+ *
 * @author xiongxy
 * @email 1179705413@qq.com
 * @date 2020-12-01 03:49:46
@ -17,19 +17,22 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
 public interface BookDao {

-	BookDO get(Long id);
-	
-	List<BookDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(BookDO book);
-	
-	int update(BookDO book);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
+    BookDO get(Long id);
+
+    List<BookDO> list(Map<String, Object> map);
+
+    int count(Map<String, Object> map);
+
+    int save(BookDO book);
+
+    int update(BookDO book);
+
+    int remove(Long id);
+
+    int batchRemove(Long[] ids);

    List<Map<Object, Object>> tableSta(Date minDate);
+
+    List<BookDO> batchGet(List<Long> ids);
+
 }
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/BookIndexDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/BookIndexDao.java
@ -0,0 +1,34 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.BookIndexDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小说目录表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:51:54
+ */
+@Mapper
+public interface BookIndexDao {
+
+    BookIndexDO get(Long id);
+
+    List<BookIndexDO> list(Map<String, Object> map);
+
+    int count(Map<String, Object> map);
+
+    int save(BookIndexDO bookIndex);
+
+    int update(BookIndexDO bookIndex);
+
+    int remove(Long id);
+
+    int batchRemove(Long[] ids);
+
+    List<Long> getIdsByBookId(Long bookId);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/FriendLinkDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/FriendLinkDao.java
@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.FriendLinkDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 15:12:25
+ */
+@Mapper
+public interface FriendLinkDao {
+
+	FriendLinkDO get(Integer id);
+	
+	List<FriendLinkDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(FriendLinkDO friendLink);
+	
+	int update(FriendLinkDO friendLink);
+	
+	int remove(Integer id);
+	
+	int batchRemove(Integer[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/UserDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/UserDao.java
@ -1,15 +1,13 @@
 package com.java2nb.novel.dao;

 import com.java2nb.novel.domain.UserDO;
+import org.apache.ibatis.annotations.Mapper;

 import java.util.Date;
 import java.util.List;
 import java.util.Map;

-import org.apache.ibatis.annotations.Mapper;
-
 /**
- * 
 * @author xiongxy
 * @email 1179705413@qq.com
 * @date 2020-12-01 03:49:08
@ -17,19 +15,21 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
 public interface UserDao {

-	UserDO get(Long id);
-	
-	List<UserDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(UserDO user);
-	
-	int update(UserDO user);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
+    UserDO get(Long id);
+
+    List<UserDO> list(Map<String, Object> map);
+
+    int count(Map<String, Object> map);
+
+    int save(UserDO user);
+
+    int update(UserDO user);
+
+    int remove(Long id);
+
+    int batchRemove(Long[] ids);

    List<Map<Object, Object>> tableSta(Date minDate);
+
+    List<UserDO> batchGet(List<Long> userIds);
 }
--- a/novel-admin/src/main/java/com/java2nb/novel/dao/WebsiteInfoDao.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/dao/WebsiteInfoDao.java
@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.WebsiteInfoDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 网站信息表
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 11:05:43
+ */
+@Mapper
+public interface WebsiteInfoDao {
+
+	WebsiteInfoDO get(Long id);
+	
+	List<WebsiteInfoDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(WebsiteInfoDO websiteInfo);
+	
+	int update(WebsiteInfoDO websiteInfo);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/BookCommentDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/BookCommentDO.java
@ -0,0 +1,165 @@
+package com.java2nb.novel.domain;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 小说评论表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 21:59:28
+ */
+public class BookCommentDO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    //主键
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long id;
+    //小说ID
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long bookId;
+    //评价内容
+    private String commentContent;
+    //回复数量
+    private Integer replyCount;
+    //审核状态，0：待审核，1：审核通过，2：审核不通过
+    private Integer auditStatus;
+    //评价时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    //评价人
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long createUserId;
+
+    private String bookName;
+
+    private String userName;
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 设置：主键
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：主键
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：小说ID
+     */
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    /**
+     * 获取：小说ID
+     */
+    public Long getBookId() {
+        return bookId;
+    }
+
+    /**
+     * 设置：评价内容
+     */
+    public void setCommentContent(String commentContent) {
+        this.commentContent = commentContent;
+    }
+
+    /**
+     * 获取：评价内容
+     */
+    public String getCommentContent() {
+        return commentContent;
+    }
+
+    /**
+     * 设置：回复数量
+     */
+    public void setReplyCount(Integer replyCount) {
+        this.replyCount = replyCount;
+    }
+
+    /**
+     * 获取：回复数量
+     */
+    public Integer getReplyCount() {
+        return replyCount;
+    }
+
+    /**
+     * 设置：审核状态，0：待审核，1：审核通过，2：审核不通过
+     */
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    /**
+     * 获取：审核状态，0：待审核，1：审核通过，2：审核不通过
+     */
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    /**
+     * 设置：评价时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：评价时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置：评价人
+     */
+    public void setCreateUserId(Long createUserId) {
+        this.createUserId = createUserId;
+    }
+
+    /**
+     * 获取：评价人
+     */
+    public Long getCreateUserId() {
+        return createUserId;
+    }
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/BookContentDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/BookContentDO.java
@ -0,0 +1,77 @@
+package com.java2nb.novel.domain;
+
+import java.io.Serializable;
+
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+
+
+/**
+ * 小说内容表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:52:06
+ */
+public class BookContentDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long id;
+	//目录ID
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long indexId;
+	//小说章节内容
+			private String content;
+
+	/**
+	 * 设置：主键
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * 获取：主键
+	 */
+	public Long getId() {
+		return id;
+	}
+	/**
+	 * 设置：目录ID
+	 */
+	public void setIndexId(Long indexId) {
+		this.indexId = indexId;
+	}
+	/**
+	 * 获取：目录ID
+	 */
+	public Long getIndexId() {
+		return indexId;
+	}
+	/**
+	 * 设置：小说章节内容
+	 */
+	public void setContent(String content) {
+		this.content = content;
+	}
+	/**
+	 * 获取：小说章节内容
+	 */
+	public String getContent() {
+		return content;
+	}
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/BookDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/BookDO.java
@ -1,493 +1,455 @@
 package com.java2nb.novel.domain;

-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
 import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;

+import java.io.Serializable;
+import java.util.Date;


 /**
 * 小说表
- * 
+ *
 * @author xiongxy
 * @email 1179705413@qq.com
- * @date 2020-12-01 03:49:46
+ * @date 2023-04-14 17:42:55
 */
 public class BookDO implements Serializable {
-	private static final long serialVersionUID = 1L;

-	
-	//主键
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//作品方向，0：男频，1：女频'
-			private Integer workDirection;
-	//分类ID
-			private Integer catId;
-	//分类名
-			private String catName;
-	//子分类ID
-			private Integer catChildId;
-	//子分类名
-			private String catChildName;
-	//小说封面
-			private String picUrl;
-	//小说名
-			private String bookName;
-	//男主角姓名
-			private String heroName;
-	//女主角姓名
-			private String ladyName;
-	//作品风格，0：甜宠，1：虐恋，2：其他
-			private Integer bookStyle;
-	//作品标签
-			private String bookLabel;
-	//作者id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long authorId;
-	//作者名
-			private String authorName;
-	//书籍描述
-			private String bookDesc;
-	//评分，预留字段
-			private Float score;
-	//书籍状态，0：连载中，1：已完结
-			private Integer bookStatus;
-	//点击量
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long visitCount;
-	//总字数
-			private Integer wordCount;
-	//评论数
-			private Integer commentCount;
-	//昨日订阅数
-			private Integer yesterdayBuy;
-	//最新目录ID
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long lastIndexId;
-	//最新目录名
-			private String lastIndexName;
-	//最新目录更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date lastIndexUpdateTime;
-	//是否收费，1：收费，0：免费
-			private Integer isVip;
-	//状态，0：入库，1：上架
-			private Integer status;
-	//更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date updateTime;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//爬虫源站ID
-			private Integer crawlSourceId;
-	//抓取的源站小说ID
-			private String crawlBookId;
-	//最后一次的抓取时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date crawlLastTime;
-	//是否已停止更新，0：未停止，1：已停止
-			private Integer crawlIsStop;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 设置：主键
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：作品方向，0：男频，1：女频'
-	 */
-	public void setWorkDirection(Integer workDirection) {
-		this.workDirection = workDirection;
-	}
-	/**
-	 * 获取：作品方向，0：男频，1：女频'
-	 */
-	public Integer getWorkDirection() {
-		return workDirection;
-	}
-	/**
-	 * 设置：分类ID
-	 */
-	public void setCatId(Integer catId) {
-		this.catId = catId;
-	}
-	/**
-	 * 获取：分类ID
-	 */
-	public Integer getCatId() {
-		return catId;
-	}
-	/**
-	 * 设置：分类名
-	 */
-	public void setCatName(String catName) {
-		this.catName = catName;
-	}
-	/**
-	 * 获取：分类名
-	 */
-	public String getCatName() {
-		return catName;
-	}
-	/**
-	 * 设置：子分类ID
-	 */
-	public void setCatChildId(Integer catChildId) {
-		this.catChildId = catChildId;
-	}
-	/**
-	 * 获取：子分类ID
-	 */
-	public Integer getCatChildId() {
-		return catChildId;
-	}
-	/**
-	 * 设置：子分类名
-	 */
-	public void setCatChildName(String catChildName) {
-		this.catChildName = catChildName;
-	}
-	/**
-	 * 获取：子分类名
-	 */
-	public String getCatChildName() {
-		return catChildName;
-	}
-	/**
-	 * 设置：小说封面
-	 */
-	public void setPicUrl(String picUrl) {
-		this.picUrl = picUrl;
-	}
-	/**
-	 * 获取：小说封面
-	 */
-	public String getPicUrl() {
-		return picUrl;
-	}
-	/**
-	 * 设置：小说名
-	 */
-	public void setBookName(String bookName) {
-		this.bookName = bookName;
-	}
-	/**
-	 * 获取：小说名
-	 */
-	public String getBookName() {
-		return bookName;
-	}
-	/**
-	 * 设置：男主角姓名
-	 */
-	public void setHeroName(String heroName) {
-		this.heroName = heroName;
-	}
-	/**
-	 * 获取：男主角姓名
-	 */
-	public String getHeroName() {
-		return heroName;
-	}
-	/**
-	 * 设置：女主角姓名
-	 */
-	public void setLadyName(String ladyName) {
-		this.ladyName = ladyName;
-	}
-	/**
-	 * 获取：女主角姓名
-	 */
-	public String getLadyName() {
-		return ladyName;
-	}
-	/**
-	 * 设置：作品风格，0：甜宠，1：虐恋，2：其他
-	 */
-	public void setBookStyle(Integer bookStyle) {
-		this.bookStyle = bookStyle;
-	}
-	/**
-	 * 获取：作品风格，0：甜宠，1：虐恋，2：其他
-	 */
-	public Integer getBookStyle() {
-		return bookStyle;
-	}
-	/**
-	 * 设置：作品标签
-	 */
-	public void setBookLabel(String bookLabel) {
-		this.bookLabel = bookLabel;
-	}
-	/**
-	 * 获取：作品标签
-	 */
-	public String getBookLabel() {
-		return bookLabel;
-	}
-	/**
-	 * 设置：作者id
-	 */
-	public void setAuthorId(Long authorId) {
-		this.authorId = authorId;
-	}
-	/**
-	 * 获取：作者id
-	 */
-	public Long getAuthorId() {
-		return authorId;
-	}
-	/**
-	 * 设置：作者名
-	 */
-	public void setAuthorName(String authorName) {
-		this.authorName = authorName;
-	}
-	/**
-	 * 获取：作者名
-	 */
-	public String getAuthorName() {
-		return authorName;
-	}
-	/**
-	 * 设置：书籍描述
-	 */
-	public void setBookDesc(String bookDesc) {
-		this.bookDesc = bookDesc;
-	}
-	/**
-	 * 获取：书籍描述
-	 */
-	public String getBookDesc() {
-		return bookDesc;
-	}
-	/**
-	 * 设置：评分，预留字段
-	 */
-	public void setScore(Float score) {
-		this.score = score;
-	}
-	/**
-	 * 获取：评分，预留字段
-	 */
-	public Float getScore() {
-		return score;
-	}
-	/**
-	 * 设置：书籍状态，0：连载中，1：已完结
-	 */
-	public void setBookStatus(Integer bookStatus) {
-		this.bookStatus = bookStatus;
-	}
-	/**
-	 * 获取：书籍状态，0：连载中，1：已完结
-	 */
-	public Integer getBookStatus() {
-		return bookStatus;
-	}
-	/**
-	 * 设置：点击量
-	 */
-	public void setVisitCount(Long visitCount) {
-		this.visitCount = visitCount;
-	}
-	/**
-	 * 获取：点击量
-	 */
-	public Long getVisitCount() {
-		return visitCount;
-	}
-	/**
-	 * 设置：总字数
-	 */
-	public void setWordCount(Integer wordCount) {
-		this.wordCount = wordCount;
-	}
-	/**
-	 * 获取：总字数
-	 */
-	public Integer getWordCount() {
-		return wordCount;
-	}
-	/**
-	 * 设置：评论数
-	 */
-	public void setCommentCount(Integer commentCount) {
-		this.commentCount = commentCount;
-	}
-	/**
-	 * 获取：评论数
-	 */
-	public Integer getCommentCount() {
-		return commentCount;
-	}
-	/**
-	 * 设置：昨日订阅数
-	 */
-	public void setYesterdayBuy(Integer yesterdayBuy) {
-		this.yesterdayBuy = yesterdayBuy;
-	}
-	/**
-	 * 获取：昨日订阅数
-	 */
-	public Integer getYesterdayBuy() {
-		return yesterdayBuy;
-	}
-	/**
-	 * 设置：最新目录ID
-	 */
-	public void setLastIndexId(Long lastIndexId) {
-		this.lastIndexId = lastIndexId;
-	}
-	/**
-	 * 获取：最新目录ID
-	 */
-	public Long getLastIndexId() {
-		return lastIndexId;
-	}
-	/**
-	 * 设置：最新目录名
-	 */
-	public void setLastIndexName(String lastIndexName) {
-		this.lastIndexName = lastIndexName;
-	}
-	/**
-	 * 获取：最新目录名
-	 */
-	public String getLastIndexName() {
-		return lastIndexName;
-	}
-	/**
-	 * 设置：最新目录更新时间
-	 */
-	public void setLastIndexUpdateTime(Date lastIndexUpdateTime) {
-		this.lastIndexUpdateTime = lastIndexUpdateTime;
-	}
-	/**
-	 * 获取：最新目录更新时间
-	 */
-	public Date getLastIndexUpdateTime() {
-		return lastIndexUpdateTime;
-	}
-	/**
-	 * 设置：是否收费，1：收费，0：免费
-	 */
-	public void setIsVip(Integer isVip) {
-		this.isVip = isVip;
-	}
-	/**
-	 * 获取：是否收费，1：收费，0：免费
-	 */
-	public Integer getIsVip() {
-		return isVip;
-	}
-	/**
-	 * 设置：状态，0：入库，1：上架
-	 */
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-	/**
-	 * 获取：状态，0：入库，1：上架
-	 */
-	public Integer getStatus() {
-		return status;
-	}
-	/**
-	 * 设置：更新时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：更新时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：爬虫源站ID
-	 */
-	public void setCrawlSourceId(Integer crawlSourceId) {
-		this.crawlSourceId = crawlSourceId;
-	}
-	/**
-	 * 获取：爬虫源站ID
-	 */
-	public Integer getCrawlSourceId() {
-		return crawlSourceId;
-	}
-	/**
-	 * 设置：抓取的源站小说ID
-	 */
-	public void setCrawlBookId(String crawlBookId) {
-		this.crawlBookId = crawlBookId;
-	}
-	/**
-	 * 获取：抓取的源站小说ID
-	 */
-	public String getCrawlBookId() {
-		return crawlBookId;
-	}
-	/**
-	 * 设置：最后一次的抓取时间
-	 */
-	public void setCrawlLastTime(Date crawlLastTime) {
-		this.crawlLastTime = crawlLastTime;
-	}
-	/**
-	 * 获取：最后一次的抓取时间
-	 */
-	public Date getCrawlLastTime() {
-		return crawlLastTime;
-	}
-	/**
-	 * 设置：是否已停止更新，0：未停止，1：已停止
-	 */
-	public void setCrawlIsStop(Integer crawlIsStop) {
-		this.crawlIsStop = crawlIsStop;
-	}
-	/**
-	 * 获取：是否已停止更新，0：未停止，1：已停止
-	 */
-	public Integer getCrawlIsStop() {
-		return crawlIsStop;
-	}
+
+    //主键
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long id;
+    //作品方向，0：男频，1：女频'
+    private Integer workDirection;
+    //分类ID
+    private Integer catId;
+    //分类名
+    private String catName;
+    //小说封面
+    private String picUrl;
+    //小说名
+    private String bookName;
+    //作者id
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long authorId;
+    //作者名
+    private String authorName;
+    //书籍描述
+    private String bookDesc;
+    //评分，预留字段
+    private Float score;
+    //书籍状态，0：连载中，1：已完结
+    private Integer bookStatus;
+    //点击量
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long visitCount;
+    //总字数
+    private Integer wordCount;
+    //评论数
+    private Integer commentCount;
+    //昨日订阅数
+    private Integer yesterdayBuy;
+    //最新目录ID
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long lastIndexId;
+    //最新目录名
+    private String lastIndexName;
+    //最新目录更新时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastIndexUpdateTime;
+    //是否收费，1：收费，0：免费
+    private Integer isVip;
+    //状态，0：入库，1：上架
+    private Integer status;
+    //更新时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+    //创建时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    //爬虫源站ID
+    private Integer crawlSourceId;
+    //抓取的源站小说ID
+    private String crawlBookId;
+    //最后一次的抓取时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date crawlLastTime;
+    //是否已停止更新，0：未停止，1：已停止
+    private Integer crawlIsStop;
+
+    /**
+     * 设置：主键
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：主键
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：作品方向，0：男频，1：女频'
+     */
+    public void setWorkDirection(Integer workDirection) {
+        this.workDirection = workDirection;
+    }
+
+    /**
+     * 获取：作品方向，0：男频，1：女频'
+     */
+    public Integer getWorkDirection() {
+        return workDirection;
+    }
+
+    /**
+     * 设置：分类ID
+     */
+    public void setCatId(Integer catId) {
+        this.catId = catId;
+    }
+
+    /**
+     * 获取：分类ID
+     */
+    public Integer getCatId() {
+        return catId;
+    }
+
+    /**
+     * 设置：分类名
+     */
+    public void setCatName(String catName) {
+        this.catName = catName;
+    }
+
+    /**
+     * 获取：分类名
+     */
+    public String getCatName() {
+        return catName;
+    }
+
+    /**
+     * 设置：小说封面
+     */
+    public void setPicUrl(String picUrl) {
+        this.picUrl = picUrl;
+    }
+
+    /**
+     * 获取：小说封面
+     */
+    public String getPicUrl() {
+        return picUrl;
+    }
+
+    /**
+     * 设置：小说名
+     */
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    /**
+     * 获取：小说名
+     */
+    public String getBookName() {
+        return bookName;
+    }
+
+    /**
+     * 设置：作者id
+     */
+    public void setAuthorId(Long authorId) {
+        this.authorId = authorId;
+    }
+
+    /**
+     * 获取：作者id
+     */
+    public Long getAuthorId() {
+        return authorId;
+    }
+
+    /**
+     * 设置：作者名
+     */
+    public void setAuthorName(String authorName) {
+        this.authorName = authorName;
+    }
+
+    /**
+     * 获取：作者名
+     */
+    public String getAuthorName() {
+        return authorName;
+    }
+
+    /**
+     * 设置：书籍描述
+     */
+    public void setBookDesc(String bookDesc) {
+        this.bookDesc = bookDesc;
+    }
+
+    /**
+     * 获取：书籍描述
+     */
+    public String getBookDesc() {
+        return bookDesc;
+    }
+
+    /**
+     * 设置：评分，预留字段
+     */
+    public void setScore(Float score) {
+        this.score = score;
+    }
+
+    /**
+     * 获取：评分，预留字段
+     */
+    public Float getScore() {
+        return score;
+    }
+
+    /**
+     * 设置：书籍状态，0：连载中，1：已完结
+     */
+    public void setBookStatus(Integer bookStatus) {
+        this.bookStatus = bookStatus;
+    }
+
+    /**
+     * 获取：书籍状态，0：连载中，1：已完结
+     */
+    public Integer getBookStatus() {
+        return bookStatus;
+    }
+
+    /**
+     * 设置：点击量
+     */
+    public void setVisitCount(Long visitCount) {
+        this.visitCount = visitCount;
+    }
+
+    /**
+     * 获取：点击量
+     */
+    public Long getVisitCount() {
+        return visitCount;
+    }
+
+    /**
+     * 设置：总字数
+     */
+    public void setWordCount(Integer wordCount) {
+        this.wordCount = wordCount;
+    }
+
+    /**
+     * 获取：总字数
+     */
+    public Integer getWordCount() {
+        return wordCount;
+    }
+
+    /**
+     * 设置：评论数
+     */
+    public void setCommentCount(Integer commentCount) {
+        this.commentCount = commentCount;
+    }
+
+    /**
+     * 获取：评论数
+     */
+    public Integer getCommentCount() {
+        return commentCount;
+    }
+
+    /**
+     * 设置：昨日订阅数
+     */
+    public void setYesterdayBuy(Integer yesterdayBuy) {
+        this.yesterdayBuy = yesterdayBuy;
+    }
+
+    /**
+     * 获取：昨日订阅数
+     */
+    public Integer getYesterdayBuy() {
+        return yesterdayBuy;
+    }
+
+    /**
+     * 设置：最新目录ID
+     */
+    public void setLastIndexId(Long lastIndexId) {
+        this.lastIndexId = lastIndexId;
+    }
+
+    /**
+     * 获取：最新目录ID
+     */
+    public Long getLastIndexId() {
+        return lastIndexId;
+    }
+
+    /**
+     * 设置：最新目录名
+     */
+    public void setLastIndexName(String lastIndexName) {
+        this.lastIndexName = lastIndexName;
+    }
+
+    /**
+     * 获取：最新目录名
+     */
+    public String getLastIndexName() {
+        return lastIndexName;
+    }
+
+    /**
+     * 设置：最新目录更新时间
+     */
+    public void setLastIndexUpdateTime(Date lastIndexUpdateTime) {
+        this.lastIndexUpdateTime = lastIndexUpdateTime;
+    }
+
+    /**
+     * 获取：最新目录更新时间
+     */
+    public Date getLastIndexUpdateTime() {
+        return lastIndexUpdateTime;
+    }
+
+    /**
+     * 设置：是否收费，1：收费，0：免费
+     */
+    public void setIsVip(Integer isVip) {
+        this.isVip = isVip;
+    }
+
+    /**
+     * 获取：是否收费，1：收费，0：免费
+     */
+    public Integer getIsVip() {
+        return isVip;
+    }
+
+    /**
+     * 设置：状态，0：入库，1：上架
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取：状态，0：入库，1：上架
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置：更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置：爬虫源站ID
+     */
+    public void setCrawlSourceId(Integer crawlSourceId) {
+        this.crawlSourceId = crawlSourceId;
+    }
+
+    /**
+     * 获取：爬虫源站ID
+     */
+    public Integer getCrawlSourceId() {
+        return crawlSourceId;
+    }
+
+    /**
+     * 设置：抓取的源站小说ID
+     */
+    public void setCrawlBookId(String crawlBookId) {
+        this.crawlBookId = crawlBookId;
+    }
+
+    /**
+     * 获取：抓取的源站小说ID
+     */
+    public String getCrawlBookId() {
+        return crawlBookId;
+    }
+
+    /**
+     * 设置：最后一次的抓取时间
+     */
+    public void setCrawlLastTime(Date crawlLastTime) {
+        this.crawlLastTime = crawlLastTime;
+    }
+
+    /**
+     * 获取：最后一次的抓取时间
+     */
+    public Date getCrawlLastTime() {
+        return crawlLastTime;
+    }
+
+    /**
+     * 设置：是否已停止更新，0：未停止，1：已停止
+     */
+    public void setCrawlIsStop(Integer crawlIsStop) {
+        this.crawlIsStop = crawlIsStop;
+    }
+
+    /**
+     * 获取：是否已停止更新，0：未停止，1：已停止
+     */
+    public Integer getCrawlIsStop() {
+        return crawlIsStop;
+    }
 }
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/BookIndexDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/BookIndexDO.java
@ -0,0 +1,177 @@
+package com.java2nb.novel.domain;
+
+import java.io.Serializable;
+
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+
+
+/**
+ * 小说目录表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:51:54
+ */
+public class BookIndexDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long id;
+	//小说ID
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long bookId;
+	//目录号
+			private Integer indexNum;
+	//目录名
+			private String indexName;
+	//字数
+			private Integer wordCount;
+	//是否收费，1：收费，0：免费
+			private Integer isVip;
+	//章节费用（屋币）
+			private Integer bookPrice;
+	//存储方式
+			private String storageType;
+	//
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date createTime;
+	//
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date updateTime;
+
+	/**
+	 * 设置：主键
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * 获取：主键
+	 */
+	public Long getId() {
+		return id;
+	}
+	/**
+	 * 设置：小说ID
+	 */
+	public void setBookId(Long bookId) {
+		this.bookId = bookId;
+	}
+	/**
+	 * 获取：小说ID
+	 */
+	public Long getBookId() {
+		return bookId;
+	}
+	/**
+	 * 设置：目录号
+	 */
+	public void setIndexNum(Integer indexNum) {
+		this.indexNum = indexNum;
+	}
+	/**
+	 * 获取：目录号
+	 */
+	public Integer getIndexNum() {
+		return indexNum;
+	}
+	/**
+	 * 设置：目录名
+	 */
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+	/**
+	 * 获取：目录名
+	 */
+	public String getIndexName() {
+		return indexName;
+	}
+	/**
+	 * 设置：字数
+	 */
+	public void setWordCount(Integer wordCount) {
+		this.wordCount = wordCount;
+	}
+	/**
+	 * 获取：字数
+	 */
+	public Integer getWordCount() {
+		return wordCount;
+	}
+	/**
+	 * 设置：是否收费，1：收费，0：免费
+	 */
+	public void setIsVip(Integer isVip) {
+		this.isVip = isVip;
+	}
+	/**
+	 * 获取：是否收费，1：收费，0：免费
+	 */
+	public Integer getIsVip() {
+		return isVip;
+	}
+	/**
+	 * 设置：章节费用（屋币）
+	 */
+	public void setBookPrice(Integer bookPrice) {
+		this.bookPrice = bookPrice;
+	}
+	/**
+	 * 获取：章节费用（屋币）
+	 */
+	public Integer getBookPrice() {
+		return bookPrice;
+	}
+	/**
+	 * 设置：存储方式
+	 */
+	public void setStorageType(String storageType) {
+		this.storageType = storageType;
+	}
+	/**
+	 * 获取：存储方式
+	 */
+	public String getStorageType() {
+		return storageType;
+	}
+	/**
+	 * 设置：
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	/**
+	 * 获取：
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * 设置：
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	/**
+	 * 获取：
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/FriendLinkDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/FriendLinkDO.java
@ -0,0 +1,163 @@
+package com.java2nb.novel.domain;
+
+import java.io.Serializable;
+
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+
+
+/**
+ * 
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 15:12:25
+ */
+public class FriendLinkDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+			private Integer id;
+	//链接名
+			private String linkName;
+	//链接url
+			private String linkUrl;
+	//排序号
+			private Integer sort;
+	//是否开启，0：不开启，1：开启
+			private Integer isOpen;
+	//创建人id
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long createUserId;
+	//创建时间
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date createTime;
+	//更新者用户id
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long updateUserId;
+	//更新时间
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date updateTime;
+
+	/**
+	 * 设置：主键
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	/**
+	 * 获取：主键
+	 */
+	public Integer getId() {
+		return id;
+	}
+	/**
+	 * 设置：链接名
+	 */
+	public void setLinkName(String linkName) {
+		this.linkName = linkName;
+	}
+	/**
+	 * 获取：链接名
+	 */
+	public String getLinkName() {
+		return linkName;
+	}
+	/**
+	 * 设置：链接url
+	 */
+	public void setLinkUrl(String linkUrl) {
+		this.linkUrl = linkUrl;
+	}
+	/**
+	 * 获取：链接url
+	 */
+	public String getLinkUrl() {
+		return linkUrl;
+	}
+	/**
+	 * 设置：排序号
+	 */
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+	/**
+	 * 获取：排序号
+	 */
+	public Integer getSort() {
+		return sort;
+	}
+	/**
+	 * 设置：是否开启，0：不开启，1：开启
+	 */
+	public void setIsOpen(Integer isOpen) {
+		this.isOpen = isOpen;
+	}
+	/**
+	 * 获取：是否开启，0：不开启，1：开启
+	 */
+	public Integer getIsOpen() {
+		return isOpen;
+	}
+	/**
+	 * 设置：创建人id
+	 */
+	public void setCreateUserId(Long createUserId) {
+		this.createUserId = createUserId;
+	}
+	/**
+	 * 获取：创建人id
+	 */
+	public Long getCreateUserId() {
+		return createUserId;
+	}
+	/**
+	 * 设置：创建时间
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	/**
+	 * 获取：创建时间
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * 设置：更新者用户id
+	 */
+	public void setUpdateUserId(Long updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+	/**
+	 * 获取：更新者用户id
+	 */
+	public Long getUpdateUserId() {
+		return updateUserId;
+	}
+	/**
+	 * 设置：更新时间
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	/**
+	 * 获取：更新时间
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/PayDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/PayDO.java
@ -1,166 +1,188 @@
 package com.java2nb.novel.domain;

-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
 import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;

+import java.io.Serializable;
+import java.util.Date;


 /**
 * 充值订单
- * 
+ *
 * @author xiongxy
 * @email 1179705413@qq.com
 * @date 2020-12-01 03:49:57
 */
 public class PayDO implements Serializable {
-	private static final long serialVersionUID = 1L;

-	
-	//主键
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//保留
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long outTradeNo;
-	//订单号
-			private String tradeNo;
-	//保留
-			private Integer payChannel;
-	//交易香蕉币
-			private Integer totalAmount;
-	//支付用户ID
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long userId;
-	//支付状态：0：支付失败，1：支付成功，2：待支付
-			private Integer payStatus;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//更新时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date updateTime;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 设置：主键
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：保留
-	 */
-	public void setOutTradeNo(Long outTradeNo) {
-		this.outTradeNo = outTradeNo;
-	}
-	/**
-	 * 获取：保留
-	 */
-	public Long getOutTradeNo() {
-		return outTradeNo;
-	}
-	/**
-	 * 设置：订单号
-	 */
-	public void setTradeNo(String tradeNo) {
-		this.tradeNo = tradeNo;
-	}
-	/**
-	 * 获取：订单号
-	 */
-	public String getTradeNo() {
-		return tradeNo;
-	}
-	/**
-	 * 设置：保留
-	 */
-	public void setPayChannel(Integer payChannel) {
-		this.payChannel = payChannel;
-	}
-	/**
-	 * 获取：保留
-	 */
-	public Integer getPayChannel() {
-		return payChannel;
-	}
-	/**
-	 * 设置：交易香蕉币
-	 */
-	public void setTotalAmount(Integer totalAmount) {
-		this.totalAmount = totalAmount;
-	}
-	/**
-	 * 获取：交易香蕉币
-	 */
-	public Integer getTotalAmount() {
-		return totalAmount;
-	}
-	/**
-	 * 设置：支付用户ID
-	 */
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-	/**
-	 * 获取：支付用户ID
-	 */
-	public Long getUserId() {
-		return userId;
-	}
-	/**
-	 * 设置：支付状态：0：支付失败，1：支付成功，2：待支付
-	 */
-	public void setPayStatus(Integer payStatus) {
-		this.payStatus = payStatus;
-	}
-	/**
-	 * 获取：支付状态：0：支付失败，1：支付成功，2：待支付
-	 */
-	public Integer getPayStatus() {
-		return payStatus;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：更新时间
-	 */
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-	/**
-	 * 获取：更新时间
-	 */
-	public Date getUpdateTime() {
-		return updateTime;
-	}
+
+    //主键
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long id;
+    //保留
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long outTradeNo;
+    //订单号
+    private String tradeNo;
+    //保留
+    private Integer payChannel;
+    //交易香蕉币
+    private Integer totalAmount;
+    //支付用户ID
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long userId;
+    //支付状态：0：支付失败，1：支付成功，2：待支付
+    private Integer payStatus;
+    //创建时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    //更新时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 设置：主键
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：主键
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：保留
+     */
+    public void setOutTradeNo(Long outTradeNo) {
+        this.outTradeNo = outTradeNo;
+    }
+
+    /**
+     * 获取：保留
+     */
+    public Long getOutTradeNo() {
+        return outTradeNo;
+    }
+
+    /**
+     * 设置：订单号
+     */
+    public void setTradeNo(String tradeNo) {
+        this.tradeNo = tradeNo;
+    }
+
+    /**
+     * 获取：订单号
+     */
+    public String getTradeNo() {
+        return tradeNo;
+    }
+
+    /**
+     * 设置：保留
+     */
+    public void setPayChannel(Integer payChannel) {
+        this.payChannel = payChannel;
+    }
+
+    /**
+     * 获取：保留
+     */
+    public Integer getPayChannel() {
+        return payChannel;
+    }
+
+    /**
+     * 设置：交易香蕉币
+     */
+    public void setTotalAmount(Integer totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    /**
+     * 获取：交易香蕉币
+     */
+    public Integer getTotalAmount() {
+        return totalAmount;
+    }
+
+    /**
+     * 设置：支付用户ID
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取：支付用户ID
+     */
+    public Long getUserId() {
+        return userId;
+    }
+
+    /**
+     * 设置：支付状态：0：支付失败，1：支付成功，2：待支付
+     */
+    public void setPayStatus(Integer payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    /**
+     * 获取：支付状态：0：支付失败，1：支付成功，2：待支付
+     */
+    public Integer getPayStatus() {
+        return payStatus;
+    }
+
+    /**
+     * 设置：创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置：更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取：更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
 }
--- a/novel-admin/src/main/java/com/java2nb/novel/domain/WebsiteInfoDO.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/domain/WebsiteInfoDO.java
@ -0,0 +1,208 @@
+package com.java2nb.novel.domain;
+
+import java.io.Serializable;
+
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.java2nb.common.jsonserializer.LongToStringSerializer;
+
+
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+
+
+
+/**
+ * 网站信息表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 11:05:43
+ */
+public class WebsiteInfoDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long id;
+	//网站名
+			private String name;
+	//网站域名
+			private String domain;
+	//SEO关键词
+			private String keyword;
+	//网站描述
+			private String description;
+	//站长QQ
+			private String qq;
+	//网站logo图片（默认）
+			private String logo;
+	//网站logo图片（深色）
+			private String logoDark;
+	//创建时间
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date createTime;
+	//创建人ID
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long createUserId;
+	//更新时间
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date updateTime;
+	//更新人ID
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long updateUserId;
+
+	/**
+	 * 设置：主键
+	 */
+	public void setId(Long id) {
+		this.id = id;
+	}
+	/**
+	 * 获取：主键
+	 */
+	public Long getId() {
+		return id;
+	}
+	/**
+	 * 设置：网站名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+	/**
+	 * 获取：网站名
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * 设置：网站域名
+	 */
+	public void setDomain(String domain) {
+		this.domain = domain;
+	}
+	/**
+	 * 获取：网站域名
+	 */
+	public String getDomain() {
+		return domain;
+	}
+	/**
+	 * 设置：SEO关键词
+	 */
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+	/**
+	 * 获取：SEO关键词
+	 */
+	public String getKeyword() {
+		return keyword;
+	}
+	/**
+	 * 设置：网站描述
+	 */
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	/**
+	 * 获取：网站描述
+	 */
+	public String getDescription() {
+		return description;
+	}
+	/**
+	 * 设置：站长QQ
+	 */
+	public void setQq(String qq) {
+		this.qq = qq;
+	}
+	/**
+	 * 获取：站长QQ
+	 */
+	public String getQq() {
+		return qq;
+	}
+	/**
+	 * 设置：网站logo图片（默认）
+	 */
+	public void setLogo(String logo) {
+		this.logo = logo;
+	}
+	/**
+	 * 获取：网站logo图片（默认）
+	 */
+	public String getLogo() {
+		return logo;
+	}
+	/**
+	 * 设置：网站logo图片（深色）
+	 */
+	public void setLogoDark(String logoDark) {
+		this.logoDark = logoDark;
+	}
+	/**
+	 * 获取：网站logo图片（深色）
+	 */
+	public String getLogoDark() {
+		return logoDark;
+	}
+	/**
+	 * 设置：创建时间
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	/**
+	 * 获取：创建时间
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * 设置：创建人ID
+	 */
+	public void setCreateUserId(Long createUserId) {
+		this.createUserId = createUserId;
+	}
+	/**
+	 * 获取：创建人ID
+	 */
+	public Long getCreateUserId() {
+		return createUserId;
+	}
+	/**
+	 * 设置：更新时间
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	/**
+	 * 获取：更新时间
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	/**
+	 * 设置：更新人ID
+	 */
+	public void setUpdateUserId(Long updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+	/**
+	 * 获取：更新人ID
+	 */
+	public Long getUpdateUserId() {
+		return updateUserId;
+	}
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/BookCommentService.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/BookCommentService.java
@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.BookCommentDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小说评论表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 21:59:28
+ */
+public interface BookCommentService {
+	
+	BookCommentDO get(Long id);
+	
+	List<BookCommentDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(BookCommentDO bookComment);
+	
+	int update(BookCommentDO bookComment);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/BookContentService.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/BookContentService.java
@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.BookContentDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小说内容表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:52:06
+ */
+public interface BookContentService {
+	
+	BookContentDO get(Long id);
+	
+	List<BookContentDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(BookContentDO bookContent);
+	
+	int update(BookContentDO bookContent);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/BookIndexService.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/BookIndexService.java
@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.BookIndexDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小说目录表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 19:51:54
+ */
+public interface BookIndexService {
+	
+	BookIndexDO get(Long id);
+	
+	List<BookIndexDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(BookIndexDO bookIndex);
+	
+	int update(BookIndexDO bookIndex);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/FriendLinkService.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/FriendLinkService.java
@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.FriendLinkDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 15:12:25
+ */
+public interface FriendLinkService {
+	
+	FriendLinkDO get(Integer id);
+	
+	List<FriendLinkDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(FriendLinkDO friendLink);
+	
+	int update(FriendLinkDO friendLink);
+	
+	int remove(Integer id);
+	
+	int batchRemove(Integer[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/WebsiteInfoService.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/WebsiteInfoService.java
@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.WebsiteInfoDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 网站信息表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2023-04-14 11:05:43
+ */
+public interface WebsiteInfoService {
+	
+	WebsiteInfoDO get(Long id);
+	
+	List<WebsiteInfoDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(WebsiteInfoDO websiteInfo);
+	
+	int update(WebsiteInfoDO websiteInfo);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookCommentServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookCommentServiceImpl.java
@ -0,0 +1,77 @@
+package com.java2nb.novel.service.impl;
+
+import com.java2nb.novel.dao.BookCommentDao;
+import com.java2nb.novel.dao.BookDao;
+import com.java2nb.novel.dao.UserDao;
+import com.java2nb.novel.domain.BookCommentDO;
+import com.java2nb.novel.domain.BookDO;
+import com.java2nb.novel.domain.UserDO;
+import com.java2nb.novel.service.BookCommentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Service
+public class BookCommentServiceImpl implements BookCommentService {
+
+    @Autowired
+    private BookCommentDao bookCommentDao;
+    @Autowired
+    private BookDao bookDao;
+    @Autowired
+    private UserDao userDao;
+
+    @Override
+    public BookCommentDO get(Long id) {
+        return bookCommentDao.get(id);
+    }
+
+    @Override
+    public List<BookCommentDO> list(Map<String, Object> map) {
+        List<BookCommentDO> list = bookCommentDao.list(map);
+        if (!CollectionUtils.isEmpty(list)) {
+            List<Long> bookIds = list.stream().map(BookCommentDO::getBookId).collect(Collectors.toList());
+            Map<Long, String> bookNameMap = bookDao.batchGet(bookIds).stream()
+                .collect(Collectors.toMap(BookDO::getId, BookDO::getBookName));
+            List<Long> userIds = list.stream().map(BookCommentDO::getCreateUserId).collect(Collectors.toList());
+            Map<Long, String> userNameMap = userDao.batchGet(userIds).stream()
+                .collect(Collectors.toMap(UserDO::getId, UserDO::getUsername));
+            list.forEach(v -> {
+                v.setBookName(bookNameMap.get(v.getBookId()));
+                v.setUserName(userNameMap.get(v.getCreateUserId()));
+            });
+        }
+        return list;
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return bookCommentDao.count(map);
+    }
+
+    @Override
+    public int save(BookCommentDO bookComment) {
+        return bookCommentDao.save(bookComment);
+    }
+
+    @Override
+    public int update(BookCommentDO bookComment) {
+        return bookCommentDao.update(bookComment);
+    }
+
+    @Override
+    public int remove(Long id) {
+        return bookCommentDao.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return bookCommentDao.batchRemove(ids);
+    }
+
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookContentServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookContentServiceImpl.java
@ -0,0 +1,55 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.java2nb.novel.dao.BookContentDao;
+import com.java2nb.novel.domain.BookContentDO;
+import com.java2nb.novel.service.BookContentService;
+
+
+
+@Service
+public class BookContentServiceImpl implements BookContentService {
+	@Autowired
+	private BookContentDao bookContentDao;
+	
+	@Override
+	public BookContentDO get(Long id){
+		return bookContentDao.get(id);
+	}
+	
+	@Override
+	public List<BookContentDO> list(Map<String, Object> map){
+		return bookContentDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return bookContentDao.count(map);
+	}
+	
+	@Override
+	public int save(BookContentDO bookContent){
+		return bookContentDao.save(bookContent);
+	}
+	
+	@Override
+	public int update(BookContentDO bookContent){
+		return bookContentDao.update(bookContent);
+	}
+	
+	@Override
+	public int remove(Long id){
+		return bookContentDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Long[] ids){
+		return bookContentDao.batchRemove(ids);
+	}
+	
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookIndexServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookIndexServiceImpl.java
@ -0,0 +1,55 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.java2nb.novel.dao.BookIndexDao;
+import com.java2nb.novel.domain.BookIndexDO;
+import com.java2nb.novel.service.BookIndexService;
+
+
+
+@Service
+public class BookIndexServiceImpl implements BookIndexService {
+	@Autowired
+	private BookIndexDao bookIndexDao;
+	
+	@Override
+	public BookIndexDO get(Long id){
+		return bookIndexDao.get(id);
+	}
+	
+	@Override
+	public List<BookIndexDO> list(Map<String, Object> map){
+		return bookIndexDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return bookIndexDao.count(map);
+	}
+	
+	@Override
+	public int save(BookIndexDO bookIndex){
+		return bookIndexDao.save(bookIndex);
+	}
+	
+	@Override
+	public int update(BookIndexDO bookIndex){
+		return bookIndexDao.update(bookIndex);
+	}
+	
+	@Override
+	public int remove(Long id){
+		return bookIndexDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Long[] ids){
+		return bookIndexDao.batchRemove(ids);
+	}
+	
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@ -1,65 +1,79 @@
 package com.java2nb.novel.service.impl;

+import com.java2nb.novel.dao.BookContentDao;
+import com.java2nb.novel.dao.BookDao;
+import com.java2nb.novel.dao.BookIndexDao;
+import com.java2nb.novel.domain.BookDO;
+import com.java2nb.novel.service.BookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;

 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-import com.java2nb.novel.dao.BookDao;
-import com.java2nb.novel.domain.BookDO;
-import com.java2nb.novel.service.BookService;
-
-

@Service
 public class BookServiceImpl implements BookService {
-	@Autowired
-	private BookDao bookDao;
-	
-	@Override
-	public BookDO get(Long id){
-		return bookDao.get(id);
-	}
-	
-	@Override
-	public List<BookDO> list(Map<String, Object> map){
-		return bookDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return bookDao.count(map);
-	}
-	
-	@Override
-	public int save(BookDO book){
-		return bookDao.save(book);
-	}
-	
-	@Override
-	public int update(BookDO book){
-		return bookDao.update(book);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return bookDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return bookDao.batchRemove(ids);
-	}

-	@Override
-	public Map<Object, Object> tableSta(Date minDate) {
-		List<Map<Object, Object>> maps = bookDao.tableSta(minDate);
+    @Autowired
+    private BookDao bookDao;
+    @Autowired
+    private BookIndexDao bookIndexDao;
+    @Autowired
+    private BookContentDao bookContentDao;

-		return maps.stream().collect(Collectors.toMap(x -> x.get("staDate"), x -> x.get("bookCount")));
+    @Override
+    public BookDO get(Long id) {
+        return bookDao.get(id);
+    }

-	}
+    @Override
+    public List<BookDO> list(Map<String, Object> map) {
+        return bookDao.list(map);
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return bookDao.count(map);
+    }
+
+    @Override
+    public int save(BookDO book) {
+        return bookDao.save(book);
+    }
+
+    @Override
+    public int update(BookDO book) {
+        return bookDao.update(book);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public int remove(Long id) {
+        List<Long> indexIds = bookIndexDao.getIdsByBookId(id);
+        if (!CollectionUtils.isEmpty(indexIds)) {
+            Long[] indexIdArray = indexIds.toArray(new Long[0]);
+            bookIndexDao.batchRemove(indexIdArray);
+            bookContentDao.removeByIndexIds(indexIdArray);
+        }
+        return bookDao.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return bookDao.batchRemove(ids);
+    }
+
+    @Override
+    public Map<Object, Object> tableSta(Date minDate) {
+        List<Map<Object, Object>> maps = bookDao.tableSta(minDate);
+
+        return maps.stream().collect(Collectors.toMap(x -> x.get("staDate"), x -> x.get("bookCount")));
+
+    }

 }
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/FriendLinkServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/FriendLinkServiceImpl.java
@ -0,0 +1,55 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.java2nb.novel.dao.FriendLinkDao;
+import com.java2nb.novel.domain.FriendLinkDO;
+import com.java2nb.novel.service.FriendLinkService;
+
+
+
+@Service
+public class FriendLinkServiceImpl implements FriendLinkService {
+	@Autowired
+	private FriendLinkDao friendLinkDao;
+	
+	@Override
+	public FriendLinkDO get(Integer id){
+		return friendLinkDao.get(id);
+	}
+	
+	@Override
+	public List<FriendLinkDO> list(Map<String, Object> map){
+		return friendLinkDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return friendLinkDao.count(map);
+	}
+	
+	@Override
+	public int save(FriendLinkDO friendLink){
+		return friendLinkDao.save(friendLink);
+	}
+	
+	@Override
+	public int update(FriendLinkDO friendLink){
+		return friendLinkDao.update(friendLink);
+	}
+	
+	@Override
+	public int remove(Integer id){
+		return friendLinkDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Integer[] ids){
+		return friendLinkDao.batchRemove(ids);
+	}
+	
+}
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/PayServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/PayServiceImpl.java
@ -1,66 +1,77 @@
 package com.java2nb.novel.service.impl;

+import com.java2nb.novel.dao.PayDao;
+import com.java2nb.novel.dao.UserDao;
+import com.java2nb.novel.domain.PayDO;
+import com.java2nb.novel.domain.UserDO;
+import com.java2nb.novel.service.PayService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;

 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

-import com.java2nb.novel.dao.PayDao;
-import com.java2nb.novel.domain.PayDO;
-import com.java2nb.novel.service.PayService;
-
-

@Service
 public class PayServiceImpl implements PayService {
-	@Autowired
-	private PayDao payDao;
-	
-	@Override
-	public PayDO get(Long id){
-		return payDao.get(id);
-	}
-	
-	@Override
-	public List<PayDO> list(Map<String, Object> map){
-		return payDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return payDao.count(map);
-	}
-	
-	@Override
-	public int save(PayDO pay){
-		return payDao.save(pay);
-	}
-	
-	@Override
-	public int update(PayDO pay){
-		return payDao.update(pay);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return payDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return payDao.batchRemove(ids);
-	}

-	@Override
-	public Map<Object, Object> tableSta(Date minDate) {
-		List<Map<Object, Object>> maps = payDao.tableSta(minDate);
+    @Autowired
+    private PayDao payDao;
+    @Autowired
+    private UserDao userDao;

-		return maps.stream().collect(Collectors.toMap(x -> x.get("staDate"), x -> x.get("orderCount")));
+    @Override
+    public PayDO get(Long id) {
+        return payDao.get(id);
+    }
+
+    @Override
+    public List<PayDO> list(Map<String, Object> map) {
+        List<PayDO> list = payDao.list(map);
+        if (!CollectionUtils.isEmpty(list)) {
+            List<Long> userIds = list.stream().map(PayDO::getUserId).collect(Collectors.toList());
+            Map<Long, String> userNameMap = userDao.batchGet(userIds).stream()
+                .collect(Collectors.toMap(UserDO::getId, UserDO::getUsername));
+            list.forEach(v -> v.setUserName(userNameMap.get(v.getUserId())));
+        }
+        return list;
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return payDao.count(map);
+    }
+
+    @Override
+    public int save(PayDO pay) {
+        return payDao.save(pay);
+    }
+
+    @Override
+    public int update(PayDO pay) {
+        return payDao.update(pay);
+    }
+
+    @Override
+    public int remove(Long id) {
+        return payDao.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return payDao.batchRemove(ids);
+    }
+
+    @Override
+    public Map<Object, Object> tableSta(Date minDate) {
+        List<Map<Object, Object>> maps = payDao.tableSta(minDate);
+
+        return maps.stream().collect(Collectors.toMap(x -> x.get("staDate"), x -> x.get("orderCount")));


-	}
+    }

 }
--- a/novel-admin/src/main/java/com/java2nb/novel/service/impl/WebsiteInfoServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/novel/service/impl/WebsiteInfoServiceImpl.java
@ -0,0 +1,55 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.java2nb.novel.dao.WebsiteInfoDao;
+import com.java2nb.novel.domain.WebsiteInfoDO;
+import com.java2nb.novel.service.WebsiteInfoService;
+
+
+
+@Service
+public class WebsiteInfoServiceImpl implements WebsiteInfoService {
+	@Autowired
+	private WebsiteInfoDao websiteInfoDao;
+	
+	@Override
+	public WebsiteInfoDO get(Long id){
+		return websiteInfoDao.get(id);
+	}
+	
+	@Override
+	public List<WebsiteInfoDO> list(Map<String, Object> map){
+		return websiteInfoDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return websiteInfoDao.count(map);
+	}
+	
+	@Override
+	public int save(WebsiteInfoDO websiteInfo){
+		return websiteInfoDao.save(websiteInfo);
+	}
+	
+	@Override
+	public int update(WebsiteInfoDO websiteInfo){
+		return websiteInfoDao.update(websiteInfo);
+	}
+	
+	@Override
+	public int remove(Long id){
+		return websiteInfoDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Long[] ids){
+		return websiteInfoDao.batchRemove(ids);
+	}
+	
+}
--- a/novel-admin/src/main/java/com/java2nb/system/controller/SysUserController.java
+++ b/novel-admin/src/main/java/com/java2nb/system/controller/SysUserController.java
@ -5,15 +5,16 @@ import com.java2nb.common.config.Constant;
 import com.java2nb.common.controller.BaseController;
 import com.java2nb.common.domain.Tree;
 import com.java2nb.common.service.DictService;
-import com.java2nb.common.utils.*;
+import com.java2nb.common.utils.MD5Utils;
+import com.java2nb.common.utils.PageBean;
+import com.java2nb.common.utils.Query;
+import com.java2nb.common.utils.R;
 import com.java2nb.system.domain.DeptDO;
 import com.java2nb.system.domain.RoleDO;
 import com.java2nb.system.domain.UserDO;
 import com.java2nb.system.service.RoleService;
 import com.java2nb.system.service.SysUserService;
 import com.java2nb.system.vo.UserVO;
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@ -21,6 +22,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@ -28,217 +30,219 @@ import java.util.Map;
@RequestMapping("/sys/user")
@Controller
 public class SysUserController extends BaseController {
-	private String prefix="system/user"  ;
-	@Autowired
-	SysUserService userService;
-	@Autowired
-	RoleService roleService;
-	@Autowired
-	DictService dictService;
-	@Autowired
-	RedisUtil redisUtil;

-	@RequiresPermissions("sys:user:user")
-	@GetMapping("")
-	String user(Model model) {
-		return prefix + "/user";
-	}
+    private String prefix = "system/user";
+    @Autowired
+    SysUserService userService;
+    @Autowired
+    RoleService roleService;
+    @Autowired
+    DictService dictService;

-	@GetMapping("/list")
-	@ResponseBody
-	PageBean list(@RequestParam Map<String, Object> params) {
-		// 查询列表数据
-		Query query = new Query(params);
-		List<UserDO> sysUserList = userService.list(query);
-		int total = userService.count(query);
-		PageBean pageUtil = new PageBean(sysUserList, total);
-		return pageUtil;
-	}
+    @RequiresPermissions("sys:user:user")
+    @GetMapping("")
+    String user(Model model) {
+        return prefix + "/user";
+    }

-	@RequiresPermissions("sys:user:add")
-	@Log("添加用户")
-	@GetMapping("/add")
-	String add(Model model) {
-		List<RoleDO> roles = roleService.list();
-		model.addAttribute("roles", roles);
-		return prefix + "/add";
-	}
+    @GetMapping("/list")
+    @ResponseBody
+    PageBean list(@RequestParam Map<String, Object> params) {
+        // 查询列表数据
+        Query query = new Query(params);
+        List<UserDO> sysUserList = userService.list(query);
+        int total = userService.count(query);
+        PageBean pageUtil = new PageBean(sysUserList, total);
+        return pageUtil;
+    }

-	@RequiresPermissions("sys:user:edit")
-	@Log("编辑用户")
-	@GetMapping("/edit/{id}")
-	String edit(Model model, @PathVariable("id") Long id) {
-		UserDO userDO = userService.get(id);
-		model.addAttribute("user", userDO);
-		List<RoleDO> roles = roleService.list(id);
-		model.addAttribute("roles", roles);
-		return prefix+"/edit";
-	}
+    @RequiresPermissions("sys:user:add")
+    @Log("添加用户")
+    @GetMapping("/add")
+    String add(Model model) {
+        List<RoleDO> roles = roleService.list();
+        model.addAttribute("roles", roles);
+        return prefix + "/add";
+    }

-	public static void main(String[] args) {
-		System.out.println(MD5Utils.encrypt("admin", "admin"));
-	}
+    @RequiresPermissions("sys:user:edit")
+    @Log("编辑用户")
+    @GetMapping("/edit/{id}")
+    String edit(Model model, @PathVariable("id") Long id) {
+        UserDO userDO = userService.get(id);
+        model.addAttribute("user", userDO);
+        List<RoleDO> roles = roleService.list(id);
+        model.addAttribute("roles", roles);
+        return prefix + "/edit";
+    }

-	@RequiresPermissions("sys:user:add")
-	@Log("保存用户")
-	@PostMapping("/save")
-	@ResponseBody
-	R save(UserDO user) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		user.setPassword(MD5Utils.encrypt(user.getUsername(), user.getPassword()));
-		if (userService.save(user) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
+    public static void main(String[] args) {
+        System.out.println(MD5Utils.encrypt("admin", "admin"));
+    }

-	@RequiresPermissions("sys:user:edit")
-	@Log("更新用户")
-	@PostMapping("/update")
-	@ResponseBody
-	R update(UserDO user) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (userService.update(user) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
+    @RequiresPermissions("sys:user:add")
+    @Log("保存用户")
+    @PostMapping("/save")
+    @ResponseBody
+    R save(UserDO user) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        user.setPassword(MD5Utils.encrypt(user.getUsername(), user.getPassword()));
+        if (userService.save(user) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    @RequiresPermissions("sys:user:edit")
+    @Log("更新用户")
+    @PostMapping("/update")
+    @ResponseBody
+    R update(UserDO user) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        if (userService.update(user) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }


-	@RequiresPermissions("sys:user:edit")
-	@Log("更新用户")
-	@PostMapping("/updatePeronal")
-	@ResponseBody
-	R updatePeronal(UserDO user) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (userService.updatePersonal(user) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
+    @RequiresPermissions("sys:user:edit")
+    @Log("更新用户")
+    @PostMapping("/updatePeronal")
+    @ResponseBody
+    R updatePeronal(UserDO user) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        if (userService.updatePersonal(user) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }


-	@RequiresPermissions("sys:user:remove")
-	@Log("删除用户")
-	@PostMapping("/remove")
-	@ResponseBody
-	R remove(Long id) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		if (userService.remove(id) > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
+    @RequiresPermissions("sys:user:remove")
+    @Log("删除用户")
+    @PostMapping("/remove")
+    @ResponseBody
+    R remove(Long id) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        if (userService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }

-	@RequiresPermissions("sys:user:batchRemove")
-	@Log("批量删除用户")
-	@PostMapping("/batchRemove")
-	@ResponseBody
-	R batchRemove(@RequestParam("ids[]") Long[] userIds) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		int r = userService.batchremove(userIds);
-		if (r > 0) {
-			return R.ok();
-		}
-		return R.error();
-	}
+    @RequiresPermissions("sys:user:batchRemove")
+    @Log("批量删除用户")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    R batchRemove(@RequestParam("ids[]") Long[] userIds) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        int r = userService.batchremove(userIds);
+        if (r > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }

-	@PostMapping("/exit")
-	@ResponseBody
-	boolean exit(@RequestParam Map<String, Object> params) {
-		// 存在，不通过，false
-		return !userService.exit(params);
-	}
+    @PostMapping("/exit")
+    @ResponseBody
+    boolean exit(@RequestParam Map<String, Object> params) {
+        // 存在，不通过，false
+        return !userService.exit(params);
+    }

-	@RequiresPermissions("sys:user:resetPwd")
-	@Log("请求更改用户密码")
-	@GetMapping("/resetPwd/{id}")
-	String resetPwd(@PathVariable("id") Long userId, Model model) {
+    @RequiresPermissions("sys:user:resetPwd")
+    @Log("请求更改用户密码")
+    @GetMapping("/resetPwd/{id}")
+    String resetPwd(@PathVariable("id") Long userId, Model model) {

-		UserDO userDO = new UserDO();
-		userDO.setUserId(userId);
-		model.addAttribute("user", userDO);
-		return prefix + "/reset_pwd";
-	}
+        UserDO userDO = new UserDO();
+        userDO.setUserId(userId);
+        model.addAttribute("user", userDO);
+        return prefix + "/reset_pwd";
+    }

-	@Log("提交更改用户密码")
-	@PostMapping("/resetPwd")
-	@ResponseBody
-	R resetPwd(UserVO userVO) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		try{
-			userService.resetPwd(userVO,getUser());
-			return R.ok();
-		}catch (Exception e){
-			return R.error(1,e.getMessage());
-		}
+    @Log("提交更改用户密码")
+    @PostMapping("/resetPwd")
+    @ResponseBody
+    R resetPwd(UserVO userVO) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        try {
+            userService.resetPwd(userVO, getUser());
+            return R.ok();
+        } catch (Exception e) {
+            return R.error(1, e.getMessage());
+        }

-	}
-	@RequiresPermissions("sys:user:resetPwd")
-	@Log("admin提交更改用户密码")
-	@PostMapping("/adminResetPwd")
-	@ResponseBody
-	R adminResetPwd(UserVO userVO) {
-		if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		try{
-			userService.adminResetPwd(userVO);
-			return R.ok();
-		}catch (Exception e){
-			return R.error(1,e.getMessage());
-		}
+    }

-	}
-	@GetMapping("/tree")
-	@ResponseBody
-	public Tree<DeptDO> tree() {
-		Tree<DeptDO> tree = new Tree<DeptDO>();
-		tree = userService.getTree();
-		return tree;
-	}
+    @RequiresPermissions("sys:user:resetPwd")
+    @Log("admin提交更改用户密码")
+    @PostMapping("/adminResetPwd")
+    @ResponseBody
+    R adminResetPwd(UserVO userVO) {
+        if (Constant.DEMO_ACCOUNT.equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        try {
+            userService.adminResetPwd(userVO);
+            return R.ok();
+        } catch (Exception e) {
+            return R.error(1, e.getMessage());
+        }

-	@GetMapping("/treeView")
-	String treeView() {
-		return  prefix + "/userTree";
-	}
+    }

-	@GetMapping("/personal")
-	String personal(Model model) {
-		UserDO userDO  = userService.get(getUserId());
-		model.addAttribute("user",userDO);
-		model.addAttribute("hobbyList",dictService.getHobbyList(userDO));
-		model.addAttribute("sexList",dictService.getSexList());
-		return prefix + "/personal";
-	}
-	@ResponseBody
-	@PostMapping("/uploadImg")
-	R uploadImg(@RequestParam("avatar_file") MultipartFile file, String avatar_data, HttpServletRequest request) {
-		if ("test".equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
-		Map<String, Object> result = new HashMap<>();
-		try {
-			result = userService.updatePersonalImg(file, avatar_data, getUserId());
-		} catch (Exception e) {
-			return R.error("更新图像失败！");
-		}
-		if(result!=null && result.size()>0){
-			return R.ok(result);
-		}else {
-			return R.error("更新图像失败！");
-		}
-	}
+    @GetMapping("/tree")
+    @ResponseBody
+    public Tree<DeptDO> tree() {
+        Tree<DeptDO> tree = new Tree<DeptDO>();
+        tree = userService.getTree();
+        return tree;
+    }
+
+    @GetMapping("/treeView")
+    String treeView() {
+        return prefix + "/userTree";
+    }
+
+    @GetMapping("/personal")
+    String personal(Model model) {
+        UserDO userDO = userService.get(getUserId());
+        model.addAttribute("user", userDO);
+        model.addAttribute("hobbyList", dictService.getHobbyList(userDO));
+        model.addAttribute("sexList", dictService.getSexList());
+        return prefix + "/personal";
+    }
+
+    @ResponseBody
+    @PostMapping("/uploadImg")
+    R uploadImg(@RequestParam("avatar_file") MultipartFile file, String avatar_data, HttpServletRequest request) {
+        if ("test".equals(getUsername())) {
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+        }
+        Map<String, Object> result = new HashMap<>();
+        try {
+            result = userService.updatePersonalImg(file, avatar_data, getUserId());
+        } catch (Exception e) {
+            return R.error("更新图像失败！");
+        }
+        if (result != null && result.size() > 0) {
+            return R.ok(result);
+        } else {
+            return R.error("更新图像失败！");
+        }
+    }
 }
--- a/novel-admin/src/main/java/com/java2nb/system/domain/DataPermDO.java
+++ b/novel-admin/src/main/java/com/java2nb/system/domain/DataPermDO.java
@ -1,174 +1,212 @@
 package com.java2nb.system.domain;

-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
 import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;

+import java.io.Serializable;
+import java.util.Date;
+import java.util.Objects;


 /**
 * 数据权限管理
- * 
+ *
 * @author xiongxy
 * @email 1179705413@qq.com
 * @date 2019-11-25 11:40:03
 */
 public class DataPermDO implements Serializable {
-	private static final long serialVersionUID = 1L;

-	
-	//
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//权限名称
-			private String name;
-	//数据表名称
-			private String tableName;
-	//所属模块
-			private String moduleName;
-	//用户权限控制属性名
-			private String crlAttrName;
-	//数据表权限控制列名
-			private String crlColumnName;
-	//权限code，all_开头表示查看所有数据的权限，sup_开头表示查看下级数据的权限，own_开头表示查看本级数据的权限
-			private String permCode;
-	//排序
-			private Integer orderNum;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date gmtCreate;
-	//修改时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date gmtModified;
+    private static final long serialVersionUID = 1L;

-	/**
-	 * 设置：
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：权限名称
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-	/**
-	 * 获取：权限名称
-	 */
-	public String getName() {
-		return name;
-	}
-	/**
-	 * 设置：数据表名称
-	 */
-	public void setTableName(String tableName) {
-		this.tableName = tableName;
-	}
-	/**
-	 * 获取：数据表名称
-	 */
-	public String getTableName() {
-		return tableName;
-	}
-	/**
-	 * 设置：所属模块
-	 */
-	public void setModuleName(String moduleName) {
-		this.moduleName = moduleName;
-	}
-	/**
-	 * 获取：所属模块
-	 */
-	public String getModuleName() {
-		return moduleName;
-	}
-	/**
-	 * 设置：用户权限控制属性名
-	 */
-	public void setCrlAttrName(String crlAttrName) {
-		this.crlAttrName = crlAttrName;
-	}
-	/**
-	 * 获取：用户权限控制属性名
-	 */
-	public String getCrlAttrName() {
-		return crlAttrName;
-	}
-	/**
-	 * 设置：数据表权限控制列名
-	 */
-	public void setCrlColumnName(String crlColumnName) {
-		this.crlColumnName = crlColumnName;
-	}
-	/**
-	 * 获取：数据表权限控制列名
-	 */
-	public String getCrlColumnName() {
-		return crlColumnName;
-	}
-	/**
-	 * 设置：权限code，all_开头表示查看所有数据的权限，sup_开头表示查看下级数据的权限，own_开头表示查看本级数据的权限
-	 */
-	public void setPermCode(String permCode) {
-		this.permCode = permCode;
-	}
-	/**
-	 * 获取：权限code，all_开头表示查看所有数据的权限，sup_开头表示查看下级数据的权限，own_开头表示查看本级数据的权限
-	 */
-	public String getPermCode() {
-		return permCode;
-	}
-	/**
-	 * 设置：排序
-	 */
-	public void setOrderNum(Integer orderNum) {
-		this.orderNum = orderNum;
-	}
-	/**
-	 * 获取：排序
-	 */
-	public Integer getOrderNum() {
-		return orderNum;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setGmtCreate(Date gmtCreate) {
-		this.gmtCreate = gmtCreate;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getGmtCreate() {
-		return gmtCreate;
-	}
-	/**
-	 * 设置：修改时间
-	 */
-	public void setGmtModified(Date gmtModified) {
-		this.gmtModified = gmtModified;
-	}
-	/**
-	 * 获取：修改时间
-	 */
-	public Date getGmtModified() {
-		return gmtModified;
-	}
+
+    //
+    //java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+    //所以通过序列化成字符串来解决
+    @JsonSerialize(using = LongToStringSerializer.class)
+    private Long id;
+    //权限名称
+    private String name;
+    //数据表名称
+    private String tableName;
+    //所属模块
+    private String moduleName;
+    //用户权限控制属性名
+    private String crlAttrName;
+    //数据表权限控制列名
+    private String crlColumnName;
+    //权限code，all_开头表示查看所有数据的权限，sup_开头表示查看下级数据的权限，own_开头表示查看本级数据的权限
+    private String permCode;
+    //排序
+    private Integer orderNum;
+    //创建时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date gmtCreate;
+    //修改时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date gmtModified;
+
+    /**
+     * 设置：
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取：
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 设置：权限名称
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 获取：权限名称
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 设置：数据表名称
+     */
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+
+    /**
+     * 获取：数据表名称
+     */
+    public String getTableName() {
+        return tableName;
+    }
+
+    /**
+     * 设置：所属模块
+     */
+    public void setModuleName(String moduleName) {
+        this.moduleName = moduleName;
+    }
+
+    /**
+     * 获取：所属模块
+     */
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    /**
+     * 设置：用户权限控制属性名
+     */
+    public void setCrlAttrName(String crlAttrName) {
+        this.crlAttrName = crlAttrName;
+    }
+
+    /**
+     * 获取：用户权限控制属性名
+     */
+    public String getCrlAttrName() {
+        return crlAttrName;
+    }
+
+    /**
+     * 设置：数据表权限控制列名
+     */
+    public void setCrlColumnName(String crlColumnName) {
+        this.crlColumnName = crlColumnName;
+    }
+
+    /**
+     * 获取：数据表权限控制列名
+     */
+    public String getCrlColumnName() {
+        return crlColumnName;
+    }
+
+    /**
+     * 设置：权限code，all_开头表示查看所有数据的权限，sup_开头表示查看下级数据的权限，own_开头表示查看本级数据的权限
+     */
+    public void setPermCode(String permCode) {
+        this.permCode = permCode;
+    }
+
+    /**
+     * 获取：权限code，all_开头表示查看所有数据的权限，sup_开头表示查看下级数据的权限，own_开头表示查看本级数据的权限
+     */
+    public String getPermCode() {
+        return permCode;
+    }
+
+    /**
+     * 设置：排序
+     */
+    public void setOrderNum(Integer orderNum) {
+        this.orderNum = orderNum;
+    }
+
+    /**
+     * 获取：排序
+     */
+    public Integer getOrderNum() {
+        return orderNum;
+    }
+
+    /**
+     * 设置：创建时间
+     */
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+
+    /**
+     * 获取：创建时间
+     */
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    /**
+     * 设置：修改时间
+     */
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+
+    /**
+     * 获取：修改时间
+     */
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DataPermDO that = (DataPermDO) o;
+        return Objects.equals(id, that.id) && Objects.equals(name, that.name)
+            && Objects.equals(tableName, that.tableName) && Objects.equals(moduleName, that.moduleName)
+            && Objects.equals(crlAttrName, that.crlAttrName) && Objects.equals(crlColumnName,
+            that.crlColumnName) && Objects.equals(permCode, that.permCode) && Objects.equals(orderNum,
+            that.orderNum) && Objects.equals(gmtCreate, that.gmtCreate) && Objects.equals(gmtModified,
+            that.gmtModified);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, tableName, moduleName, crlAttrName, crlColumnName, permCode, orderNum, gmtCreate,
+            gmtModified);
+    }
 }
--- a/novel-admin/src/main/java/com/java2nb/system/service/impl/DataPermServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/system/service/impl/DataPermServiceImpl.java
@ -1,10 +1,12 @@
 package com.java2nb.system.service.impl;

-import com.java2nb.common.domain.DictDO;
 import com.java2nb.common.domain.Tree;
 import com.java2nb.common.utils.BuildTree;
 import com.java2nb.common.utils.IdWorker;
+import com.java2nb.system.dao.DataPermDao;
 import com.java2nb.system.dao.RoleDataPermDao;
+import com.java2nb.system.domain.DataPermDO;
+import com.java2nb.system.service.DataPermService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

@ -12,119 +14,116 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import com.java2nb.system.dao.DataPermDao;
-import com.java2nb.system.domain.DataPermDO;
-import com.java2nb.system.service.DataPermService;
-
+import java.util.stream.Collectors;


@Service
 public class DataPermServiceImpl implements DataPermService {
-	@Autowired
-	private DataPermDao dataPermDao;

-	@Autowired
-	private RoleDataPermDao roleDataPermDao;
-	
-	@Override
-	public DataPermDO get(Long id){
-		return dataPermDao.get(id);
-	}
-	
-	@Override
-	public List<DataPermDO> list(Map<String, Object> map){
-		return dataPermDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return dataPermDao.count(map);
-	}
-	
-	@Override
-	public int save(DataPermDO dataPerm){
-		return dataPermDao.save(dataPerm);
-	}
-	
-	@Override
-	public int update(DataPermDO dataPerm){
-		return dataPermDao.update(dataPerm);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return dataPermDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return dataPermDao.batchRemove(ids);
-	}
+    @Autowired
+    private DataPermDao dataPermDao;

-	@Override
-	public List<DataPermDO> listModuleName() {
-		return dataPermDao.listModuleName();
-	}
+    @Autowired
+    private RoleDataPermDao roleDataPermDao;

-	@Override
-	public Tree<DataPermDO> getTree() {
-		List<Tree<DataPermDO>> trees = new ArrayList<Tree<DataPermDO>>();
-		List<DataPermDO> permDOs = dataPermDao.list(new HashMap<>(16));
-		Map<String,String> topTree = new HashMap<>();
-		for (DataPermDO permDO : permDOs) {
-			Tree<DataPermDO> tree = new Tree<>();
-			tree.setId(permDO.getId().toString());
-			if(!topTree.containsKey(permDO.getModuleName())){
-				Tree<DataPermDO> parentTree = new Tree<>();
-				String id = new IdWorker().nextId()+"";
-				parentTree.setId(id);
-				parentTree.setParentId(0+"");
-				parentTree.setText(permDO.getModuleName());
-				topTree.put(permDO.getModuleName(),id);
-				trees.add(parentTree);
-			}
-			tree.setParentId(topTree.get(permDO.getModuleName()));
-			tree.setText(permDO.getName());
-			trees.add(tree);
-		}
-		// 默认顶级菜单为０，根据数据库实际情况调整
-		Tree<DataPermDO> t = BuildTree.build(trees);
-		return t;
-	}
+    @Override
+    public DataPermDO get(Long id) {
+        return dataPermDao.get(id);
+    }

-	@Override
-	public Tree<DataPermDO> getTree(Long roleId) {
-		List<Tree<DataPermDO>> trees = new ArrayList<Tree<DataPermDO>>();
-		List<DataPermDO> permDOs = dataPermDao.list(new HashMap<>(16));
-		List<Long> permIds = roleDataPermDao.listPermIdByRoleId(roleId);
-		Map<String,String> topTree = new HashMap<>();
-		for (DataPermDO permDO : permDOs) {
-			Tree<DataPermDO> tree = new Tree<>();
-			tree.setId(permDO.getId().toString());
-			if(!topTree.containsKey(permDO.getModuleName())){
-				Tree<DataPermDO> parentTree = new Tree<>();
-				String id = new IdWorker().nextId()+"";
-				parentTree.setId(id);
-				parentTree.setParentId(0+"");
-				parentTree.setText(permDO.getModuleName());
-				topTree.put(permDO.getModuleName(),id);
-				trees.add(parentTree);
-			}
-			tree.setParentId(topTree.get(permDO.getModuleName()));
-			tree.setText(permDO.getName());
-			Map<String, Object> state = new HashMap<>(16);
-			if (permIds.contains(permDO.getId())) {
-				state.put("selected", true);
-			} else {
-				state.put("selected", false);
-			}
-			tree.setState(state);
-			trees.add(tree);
-		}
-		// 默认顶级菜单为０，根据数据库实际情况调整
-		Tree<DataPermDO> t = BuildTree.build(trees);
-		return t;
-	}
+    @Override
+    public List<DataPermDO> list(Map<String, Object> map) {
+        return dataPermDao.list(map);
+    }
+
+    @Override
+    public int count(Map<String, Object> map) {
+        return dataPermDao.count(map);
+    }
+
+    @Override
+    public int save(DataPermDO dataPerm) {
+        return dataPermDao.save(dataPerm);
+    }
+
+    @Override
+    public int update(DataPermDO dataPerm) {
+        return dataPermDao.update(dataPerm);
+    }
+
+    @Override
+    public int remove(Long id) {
+        return dataPermDao.remove(id);
+    }
+
+    @Override
+    public int batchRemove(Long[] ids) {
+        return dataPermDao.batchRemove(ids);
+    }
+
+    @Override
+    public List<DataPermDO> listModuleName() {
+        return dataPermDao.listModuleName().stream().distinct().collect(Collectors.toList());
+    }
+
+    @Override
+    public Tree<DataPermDO> getTree() {
+        List<Tree<DataPermDO>> trees = new ArrayList<Tree<DataPermDO>>();
+        List<DataPermDO> permDOs = dataPermDao.list(new HashMap<>(16));
+        Map<String, String> topTree = new HashMap<>();
+        for (DataPermDO permDO : permDOs) {
+            Tree<DataPermDO> tree = new Tree<>();
+            tree.setId(permDO.getId().toString());
+            if (!topTree.containsKey(permDO.getModuleName())) {
+                Tree<DataPermDO> parentTree = new Tree<>();
+                String id = new IdWorker().nextId() + "";
+                parentTree.setId(id);
+                parentTree.setParentId(0 + "");
+                parentTree.setText(permDO.getModuleName());
+                topTree.put(permDO.getModuleName(), id);
+                trees.add(parentTree);
+            }
+            tree.setParentId(topTree.get(permDO.getModuleName()));
+            tree.setText(permDO.getName());
+            trees.add(tree);
+        }
+        // 默认顶级菜单为０，根据数据库实际情况调整
+        Tree<DataPermDO> t = BuildTree.build(trees);
+        return t;
+    }
+
+    @Override
+    public Tree<DataPermDO> getTree(Long roleId) {
+        List<Tree<DataPermDO>> trees = new ArrayList<Tree<DataPermDO>>();
+        List<DataPermDO> permDOs = dataPermDao.list(new HashMap<>(16));
+        List<Long> permIds = roleDataPermDao.listPermIdByRoleId(roleId);
+        Map<String, String> topTree = new HashMap<>();
+        for (DataPermDO permDO : permDOs) {
+            Tree<DataPermDO> tree = new Tree<>();
+            tree.setId(permDO.getId().toString());
+            if (!topTree.containsKey(permDO.getModuleName())) {
+                Tree<DataPermDO> parentTree = new Tree<>();
+                String id = new IdWorker().nextId() + "";
+                parentTree.setId(id);
+                parentTree.setParentId(0 + "");
+                parentTree.setText(permDO.getModuleName());
+                topTree.put(permDO.getModuleName(), id);
+                trees.add(parentTree);
+            }
+            tree.setParentId(topTree.get(permDO.getModuleName()));
+            tree.setText(permDO.getName());
+            Map<String, Object> state = new HashMap<>(16);
+            if (permIds.contains(permDO.getId())) {
+                state.put("selected", true);
+            } else {
+                state.put("selected", false);
+            }
+            tree.setState(state);
+            trees.add(tree);
+        }
+        // 默认顶级菜单为０，根据数据库实际情况调整
+        Tree<DataPermDO> t = BuildTree.build(trees);
+        return t;
+    }

 }
--- a/novel-admin/src/main/java/com/java2nb/system/service/impl/SysUserServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/system/service/impl/SysUserServiceImpl.java
@ -1,14 +1,19 @@
 package com.java2nb.system.service.impl;

-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.util.*;
-
+import com.java2nb.common.config.Constant;
 import com.java2nb.common.config.JnConfig;
 import com.java2nb.common.domain.FileDO;
+import com.java2nb.common.domain.Tree;
 import com.java2nb.common.service.FileService;
 import com.java2nb.common.utils.*;
+import com.java2nb.system.dao.DeptDao;
+import com.java2nb.system.dao.SysUserDao;
+import com.java2nb.system.dao.UserRoleDao;
+import com.java2nb.system.domain.DeptDO;
+import com.java2nb.system.domain.UserDO;
+import com.java2nb.system.domain.UserRoleDO;
 import com.java2nb.system.service.DeptService;
+import com.java2nb.system.service.SysUserService;
 import com.java2nb.system.vo.UserVO;
 import org.apache.commons.lang.ArrayUtils;
 import org.slf4j.Logger;
@ -16,22 +21,17 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
-import com.java2nb.common.domain.Tree;
-import com.java2nb.system.dao.DeptDao;
-import com.java2nb.system.dao.SysUserDao;
-import com.java2nb.system.dao.UserRoleDao;
-import com.java2nb.system.domain.DeptDO;
-import com.java2nb.system.domain.UserDO;
-import com.java2nb.system.domain.UserRoleDO;
-import com.java2nb.system.service.SysUserService;
 import org.springframework.web.multipart.MultipartFile;

 import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.util.*;

@Transactional
@Service
 public class SysUserServiceImpl implements SysUserService {
+
    @Autowired
    SysUserDao userMapper;
    @Autowired
@ -64,7 +64,7 @@ public class SysUserServiceImpl implements SysUserService {
            List<Long> childIds = deptService.listChildrenIds(deptIdl);
            childIds.add(deptIdl);
            map.put("deptId", null);
-            map.put("deptIds",childIds);
+            map.put("deptIds", childIds);
        }
        return userMapper.listByPerm(map);
    }
@ -213,7 +213,7 @@ public class SysUserServiceImpl implements SysUserService {
    public Map<String, Object> updatePersonalImg(MultipartFile file, String avatar_data, Long userId) throws Exception {
        String fileName = file.getOriginalFilename();
        fileName = FileUtil.renameToUUID(fileName);
-        FileDO sysFile = new FileDO(FileType.fileType(fileName), "/files/" + fileName, new Date());
+        FileDO sysFile = new FileDO(FileType.fileType(fileName), Constant.UPLOAD_FILES_PREFIX + fileName, new Date());
        //获取图片后缀
        String prefix = fileName.substring((fileName.lastIndexOf(".") + 1));
        String[] str = avatar_data.split(",");
--- a/novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java
+++ b/novel-admin/src/main/java/com/java2nb/test/controller/OrderController.java
@ -1,135 +0,0 @@
-package com.java2nb.test.controller;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import io.swagger.annotations.ApiOperation;
-
-
-import com.java2nb.test.domain.OrderDO;
-import com.java2nb.test.service.OrderService;
-import com.java2nb.common.utils.PageBean;
-import com.java2nb.common.utils.Query;
-import com.java2nb.common.utils.R;
-
-/**
- * 付呗-订单信息表
- *
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-
-@Controller
-@RequestMapping("/test/order")
-public class OrderController {
-    @Autowired
-    private OrderService orderService;
-
-    @GetMapping()
-    @RequiresPermissions("test:order:order")
-    String Order() {
-        return "test/order/order";
-    }
-
-    @ApiOperation(value = "获取付呗-订单信息表列表", notes = "获取付呗-订单信息表列表")
-    @ResponseBody
-    @GetMapping("/list")
-    @RequiresPermissions("test:order:order")
-    public R list(@RequestParam Map<String, Object> params) {
-        //查询列表数据
-        Query query = new Query(params);
-        List<OrderDO> orderList = orderService.list(query);
-        int total = orderService.count(query);
-        PageBean pageBean = new PageBean(orderList, total);
-        return R.ok().put("data", pageBean);
-    }
-
-    @ApiOperation(value = "新增付呗-订单信息表页面", notes = "新增付呗-订单信息表页面")
-    @GetMapping("/add")
-    @RequiresPermissions("test:order:add")
-    String add() {
-        return "test/order/add";
-    }
-
-    @ApiOperation(value = "修改付呗-订单信息表页面", notes = "修改付呗-订单信息表页面")
-    @GetMapping("/edit/{id}")
-    @RequiresPermissions("test:order:edit")
-    String edit(@PathVariable("id") Long id, Model model) {
-            OrderDO order = orderService.get(id);
-        model.addAttribute("order", order);
-        return "test/order/edit";
-    }
-
-    @ApiOperation(value = "查看付呗-订单信息表页面", notes = "查看付呗-订单信息表页面")
-    @GetMapping("/detail/{id}")
-    @RequiresPermissions("test:order:detail")
-    String detail(@PathVariable("id") Long id, Model model) {
-			OrderDO order = orderService.get(id);
-        model.addAttribute("order", order);
-        return "test/order/detail";
-    }
-
-    /**
-     * 保存
-     */
-    @ApiOperation(value = "新增付呗-订单信息表", notes = "新增付呗-订单信息表")
-    @ResponseBody
-    @PostMapping("/save")
-    @RequiresPermissions("test:order:add")
-    public R save( OrderDO order) {
-        if (orderService.save(order) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 修改
-     */
-    @ApiOperation(value = "修改付呗-订单信息表", notes = "修改付呗-订单信息表")
-    @ResponseBody
-    @RequestMapping("/update")
-    @RequiresPermissions("test:order:edit")
-    public R update( OrderDO order) {
-            orderService.update(order);
-        return R.ok();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "删除付呗-订单信息表", notes = "删除付呗-订单信息表")
-    @PostMapping("/remove")
-    @ResponseBody
-    @RequiresPermissions("test:order:remove")
-    public R remove( Long id) {
-        if (orderService.remove(id) > 0) {
-            return R.ok();
-        }
-        return R.error();
-    }
-
-    /**
-     * 删除
-     */
-    @ApiOperation(value = "批量删除付呗-订单信息表", notes = "批量删除付呗-订单信息表")
-    @PostMapping("/batchRemove")
-    @ResponseBody
-    @RequiresPermissions("test:order:batchRemove")
-    public R remove(@RequestParam("ids[]") Long[] ids) {
-            orderService.batchRemove(ids);
-        return R.ok();
-    }
-
-}
--- a/novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java
+++ b/novel-admin/src/main/java/com/java2nb/test/dao/OrderDao.java
@ -1,32 +0,0 @@
-package com.java2nb.test.dao;
-
-import com.java2nb.test.domain.OrderDO;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 付呗-订单信息表
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-@Mapper
-public interface OrderDao {
-
-	OrderDO get(Long id);
-	
-	List<OrderDO> list(Map<String,Object> map);
-	
-	int count(Map<String,Object> map);
-	
-	int save(OrderDO order);
-	
-	int update(OrderDO order);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}
--- a/novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java
+++ b/novel-admin/src/main/java/com/java2nb/test/domain/OrderDO.java
@ -1,475 +0,0 @@
-package com.java2nb.test.domain;
-
-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
-
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-
-
-/**
- * 付呗-订单信息表
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-public class OrderDO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	
-	//主键
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long id;
-	//付呗商户号
-			private String fbMerchantCode;
-	//第三方商户的订单号
-			private String merchantOrderSn;
-	//付呗订单号
-			private String orderSn;
-	//平台方订单号
-			private String platformOrderNo;
-	//商户单号
-			private String tradeNo;
-	//订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消
-			private Integer orderState;
-	//蜂鸟优惠卷抵扣
-			private Double fnCoupon;
-	//红包抵扣
-			private BigDecimal redPacket;
-	//实收金额(元)
-			private BigDecimal totalFee;
-	//订单金额
-			private BigDecimal orderPrice;
-	//手续费(元)
-			private BigDecimal fee;
-	//对商品或交易的描述
-			private String body;
-	//附加数据
-			private String attach;
-	//付呗系统的门店id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long storeId;
-	//付呗系统的收银员id
-		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
-	//所以通过序列化成字符串来解决
-	@JsonSerialize(using = LongToStringSerializer.class)
-			private Long cashierId;
-	//设备终端号
-			private String deviceNo;
-	//微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”
-			private String userId;
-	//支付宝顾客的账号
-			private String userLogonId;
-	//交易成功的时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date payTime;
-	//支付通道:1微信、2支付宝、3银联
-			private Integer payChannel;
-	//免充值代金券金额(元)
-			private BigDecimal noCashCouponFee;
-	//预充值代金券金额(元)
-			private BigDecimal cashCouponFee;
-	//顾客实际支付金额(元)
-			private BigDecimal cashFee;
-	//签名
-			private String sign;
-	//其它选项
-			private String options;
-	//创建时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date createTime;
-	//推送时间
-			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private Date pushTime;
-	//推送IP
-			private String pushIp;
-	//商户id
-			private BigDecimal mchtId;
-	//QR编号
-			private String sn;
-
-	/**
-	 * 设置：主键
-	 */
-	public void setId(Long id) {
-		this.id = id;
-	}
-	/**
-	 * 获取：主键
-	 */
-	public Long getId() {
-		return id;
-	}
-	/**
-	 * 设置：付呗商户号
-	 */
-	public void setFbMerchantCode(String fbMerchantCode) {
-		this.fbMerchantCode = fbMerchantCode;
-	}
-	/**
-	 * 获取：付呗商户号
-	 */
-	public String getFbMerchantCode() {
-		return fbMerchantCode;
-	}
-	/**
-	 * 设置：第三方商户的订单号
-	 */
-	public void setMerchantOrderSn(String merchantOrderSn) {
-		this.merchantOrderSn = merchantOrderSn;
-	}
-	/**
-	 * 获取：第三方商户的订单号
-	 */
-	public String getMerchantOrderSn() {
-		return merchantOrderSn;
-	}
-	/**
-	 * 设置：付呗订单号
-	 */
-	public void setOrderSn(String orderSn) {
-		this.orderSn = orderSn;
-	}
-	/**
-	 * 获取：付呗订单号
-	 */
-	public String getOrderSn() {
-		return orderSn;
-	}
-	/**
-	 * 设置：平台方订单号
-	 */
-	public void setPlatformOrderNo(String platformOrderNo) {
-		this.platformOrderNo = platformOrderNo;
-	}
-	/**
-	 * 获取：平台方订单号
-	 */
-	public String getPlatformOrderNo() {
-		return platformOrderNo;
-	}
-	/**
-	 * 设置：商户单号
-	 */
-	public void setTradeNo(String tradeNo) {
-		this.tradeNo = tradeNo;
-	}
-	/**
-	 * 获取：商户单号
-	 */
-	public String getTradeNo() {
-		return tradeNo;
-	}
-	/**
-	 * 设置：订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消
-	 */
-	public void setOrderState(Integer orderState) {
-		this.orderState = orderState;
-	}
-	/**
-	 * 获取：订单状态，1：未支付，2：支付成功，3：支付失败，4：支付取消
-	 */
-	public Integer getOrderState() {
-		return orderState;
-	}
-	/**
-	 * 设置：蜂鸟优惠卷抵扣
-	 */
-	public void setFnCoupon(Double fnCoupon) {
-		this.fnCoupon = fnCoupon;
-	}
-	/**
-	 * 获取：蜂鸟优惠卷抵扣
-	 */
-	public Double getFnCoupon() {
-		return fnCoupon;
-	}
-	/**
-	 * 设置：红包抵扣
-	 */
-	public void setRedPacket(BigDecimal redPacket) {
-		this.redPacket = redPacket;
-	}
-	/**
-	 * 获取：红包抵扣
-	 */
-	public BigDecimal getRedPacket() {
-		return redPacket;
-	}
-	/**
-	 * 设置：实收金额(元)
-	 */
-	public void setTotalFee(BigDecimal totalFee) {
-		this.totalFee = totalFee;
-	}
-	/**
-	 * 获取：实收金额(元)
-	 */
-	public BigDecimal getTotalFee() {
-		return totalFee;
-	}
-	/**
-	 * 设置：订单金额
-	 */
-	public void setOrderPrice(BigDecimal orderPrice) {
-		this.orderPrice = orderPrice;
-	}
-	/**
-	 * 获取：订单金额
-	 */
-	public BigDecimal getOrderPrice() {
-		return orderPrice;
-	}
-	/**
-	 * 设置：手续费(元)
-	 */
-	public void setFee(BigDecimal fee) {
-		this.fee = fee;
-	}
-	/**
-	 * 获取：手续费(元)
-	 */
-	public BigDecimal getFee() {
-		return fee;
-	}
-	/**
-	 * 设置：对商品或交易的描述
-	 */
-	public void setBody(String body) {
-		this.body = body;
-	}
-	/**
-	 * 获取：对商品或交易的描述
-	 */
-	public String getBody() {
-		return body;
-	}
-	/**
-	 * 设置：附加数据
-	 */
-	public void setAttach(String attach) {
-		this.attach = attach;
-	}
-	/**
-	 * 获取：附加数据
-	 */
-	public String getAttach() {
-		return attach;
-	}
-	/**
-	 * 设置：付呗系统的门店id
-	 */
-	public void setStoreId(Long storeId) {
-		this.storeId = storeId;
-	}
-	/**
-	 * 获取：付呗系统的门店id
-	 */
-	public Long getStoreId() {
-		return storeId;
-	}
-	/**
-	 * 设置：付呗系统的收银员id
-	 */
-	public void setCashierId(Long cashierId) {
-		this.cashierId = cashierId;
-	}
-	/**
-	 * 获取：付呗系统的收银员id
-	 */
-	public Long getCashierId() {
-		return cashierId;
-	}
-	/**
-	 * 设置：设备终端号
-	 */
-	public void setDeviceNo(String deviceNo) {
-		this.deviceNo = deviceNo;
-	}
-	/**
-	 * 获取：设备终端号
-	 */
-	public String getDeviceNo() {
-		return deviceNo;
-	}
-	/**
-	 * 设置：微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”
-	 */
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-	/**
-	 * 获取：微信顾客支付授权的“open_id”或者支付宝顾客的“buyer_user_id”
-	 */
-	public String getUserId() {
-		return userId;
-	}
-	/**
-	 * 设置：支付宝顾客的账号
-	 */
-	public void setUserLogonId(String userLogonId) {
-		this.userLogonId = userLogonId;
-	}
-	/**
-	 * 获取：支付宝顾客的账号
-	 */
-	public String getUserLogonId() {
-		return userLogonId;
-	}
-	/**
-	 * 设置：交易成功的时间
-	 */
-	public void setPayTime(Date payTime) {
-		this.payTime = payTime;
-	}
-	/**
-	 * 获取：交易成功的时间
-	 */
-	public Date getPayTime() {
-		return payTime;
-	}
-	/**
-	 * 设置：支付通道:1微信、2支付宝、3银联
-	 */
-	public void setPayChannel(Integer payChannel) {
-		this.payChannel = payChannel;
-	}
-	/**
-	 * 获取：支付通道:1微信、2支付宝、3银联
-	 */
-	public Integer getPayChannel() {
-		return payChannel;
-	}
-	/**
-	 * 设置：免充值代金券金额(元)
-	 */
-	public void setNoCashCouponFee(BigDecimal noCashCouponFee) {
-		this.noCashCouponFee = noCashCouponFee;
-	}
-	/**
-	 * 获取：免充值代金券金额(元)
-	 */
-	public BigDecimal getNoCashCouponFee() {
-		return noCashCouponFee;
-	}
-	/**
-	 * 设置：预充值代金券金额(元)
-	 */
-	public void setCashCouponFee(BigDecimal cashCouponFee) {
-		this.cashCouponFee = cashCouponFee;
-	}
-	/**
-	 * 获取：预充值代金券金额(元)
-	 */
-	public BigDecimal getCashCouponFee() {
-		return cashCouponFee;
-	}
-	/**
-	 * 设置：顾客实际支付金额(元)
-	 */
-	public void setCashFee(BigDecimal cashFee) {
-		this.cashFee = cashFee;
-	}
-	/**
-	 * 获取：顾客实际支付金额(元)
-	 */
-	public BigDecimal getCashFee() {
-		return cashFee;
-	}
-	/**
-	 * 设置：签名
-	 */
-	public void setSign(String sign) {
-		this.sign = sign;
-	}
-	/**
-	 * 获取：签名
-	 */
-	public String getSign() {
-		return sign;
-	}
-	/**
-	 * 设置：其它选项
-	 */
-	public void setOptions(String options) {
-		this.options = options;
-	}
-	/**
-	 * 获取：其它选项
-	 */
-	public String getOptions() {
-		return options;
-	}
-	/**
-	 * 设置：创建时间
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-	/**
-	 * 获取：创建时间
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-	/**
-	 * 设置：推送时间
-	 */
-	public void setPushTime(Date pushTime) {
-		this.pushTime = pushTime;
-	}
-	/**
-	 * 获取：推送时间
-	 */
-	public Date getPushTime() {
-		return pushTime;
-	}
-	/**
-	 * 设置：推送IP
-	 */
-	public void setPushIp(String pushIp) {
-		this.pushIp = pushIp;
-	}
-	/**
-	 * 获取：推送IP
-	 */
-	public String getPushIp() {
-		return pushIp;
-	}
-	/**
-	 * 设置：商户id
-	 */
-	public void setMchtId(BigDecimal mchtId) {
-		this.mchtId = mchtId;
-	}
-	/**
-	 * 获取：商户id
-	 */
-	public BigDecimal getMchtId() {
-		return mchtId;
-	}
-	/**
-	 * 设置：QR编号
-	 */
-	public void setSn(String sn) {
-		this.sn = sn;
-	}
-	/**
-	 * 获取：QR编号
-	 */
-	public String getSn() {
-		return sn;
-	}
-}
--- a/novel-admin/src/main/java/com/java2nb/test/service/OrderService.java
+++ b/novel-admin/src/main/java/com/java2nb/test/service/OrderService.java
@ -1,30 +0,0 @@
-package com.java2nb.test.service;
-
-import com.java2nb.test.domain.OrderDO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 付呗-订单信息表
- * 
- * @author xiongxy
- * @email 1179705413@qq.com
- * @date 2019-11-25 11:57:16
- */
-public interface OrderService {
-	
-	OrderDO get(Long id);
-	
-	List<OrderDO> list(Map<String, Object> map);
-	
-	int count(Map<String, Object> map);
-	
-	int save(OrderDO order);
-	
-	int update(OrderDO order);
-	
-	int remove(Long id);
-	
-	int batchRemove(Long[] ids);
-}
--- a/novel-admin/src/main/java/com/java2nb/test/service/impl/OrderServiceImpl.java
+++ b/novel-admin/src/main/java/com/java2nb/test/service/impl/OrderServiceImpl.java
@ -1,55 +0,0 @@
-package com.java2nb.test.service.impl;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.java2nb.test.dao.OrderDao;
-import com.java2nb.test.domain.OrderDO;
-import com.java2nb.test.service.OrderService;
-
-
-
-@Service
-public class OrderServiceImpl implements OrderService {
-	@Autowired
-	private OrderDao orderDao;
-	
-	@Override
-	public OrderDO get(Long id){
-		return orderDao.get(id);
-	}
-	
-	@Override
-	public List<OrderDO> list(Map<String, Object> map){
-		return orderDao.list(map);
-	}
-	
-	@Override
-	public int count(Map<String, Object> map){
-		return orderDao.count(map);
-	}
-	
-	@Override
-	public int save(OrderDO order){
-		return orderDao.save(order);
-	}
-	
-	@Override
-	public int update(OrderDO order){
-		return orderDao.update(order);
-	}
-	
-	@Override
-	public int remove(Long id){
-		return orderDao.remove(id);
-	}
-	
-	@Override
-	public int batchRemove(Long[] ids){
-		return orderDao.batchRemove(ids);
-	}
-	
-}
--- a/novel-admin/src/main/resources/application-dev.yml
+++ b/novel-admin/src/main/resources/application-dev.yml
@ -9,8 +9,8 @@ logging:
 spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
    username: root
    password: test123456
    #password:
@ -39,7 +39,7 @@ spring:
  redis:
    host: 127.0.0.1
    port: 6379
-    password: test
+    password: test123456
    # 连接超时时间（毫秒）
    timeout: 10000
    jedis:
@ -51,4 +51,48 @@ spring:
        # 连接池最大连接数（使用负值表示没有限制）
        max-active: 100
        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1
+        max-wait: -1
+
+
+
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+
+sharding:
+  jdbc:
+    datasource:
+      names: ds0,ds1
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+      ds1:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.jdbc.Driver
+        url: jdbc:mysql://localhost:3306/information_schema?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+    config:
+      sharding:
+        props:
+          sql.show: true
+        tables:
+          book_content: #book_content表
+            key-generator-column-name: id  #主键
+            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
+            table-strategy: #分表策略
+              inline:
+                shardingColumn: index_id
+                algorithm-expression: book_content${index_id % 10}
+          tables:
+            actual-data-nodes: ds${1}.tables
+          columns:
+            actual-data-nodes: ds${1}.columns
+        default-data-source-name: ds0
--- a/novel-admin/src/main/resources/application-prod.yml
+++ b/novel-admin/src/main/resources/application-prod.yml
@ -1,16 +1,19 @@
 java2nb:
-  uploadPath: /var/java2nb/uploaded_files/
+  uploadPath: /var/pic/
+  username: admin
+  password: 111111
 logging:
  level:
    root: error
-    com.java2nb: info
+    com.java2nb: error
 spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/java2nb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: java2nb
-    password: java2nb1019
+    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: root
+    password: test123456
+    #password:
    initialSize: 1
    minIdle: 3
    maxActive: 20
@ -34,18 +37,56 @@ spring:
    # 合并多个DruidDataSource的监控数据
    #useGlobalDataSourceStat: true
  redis:
-      host: 127.0.0.1
-      port: 6379
-      password:
-      # 连接超时时间（毫秒）
-      timeout: 10000
-      jedis:
-        pool:
-          # 连接池中的最大空闲连接
-          max-idle: 8
-          # 连接池中的最小空闲连接
-          min-idle: 10
-          # 连接池最大连接数（使用负值表示没有限制）
-          max-active: 100
-          # 连接池最大阻塞等待时间（使用负值表示没有限制）
-          max-wait: -1
+    host: 127.0.0.1
+    port: 6379
+    password: test
+    # 连接超时时间（毫秒）
+    timeout: 10000
+    jedis:
+      pool:
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池中的最小空闲连接
+        min-idle: 10
+        # 连接池最大连接数（使用负值表示没有限制）
+        max-active: 100
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
+
+
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+
+sharding:
+  jdbc:
+    datasource:
+      names: ds0 #,ds1
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+    #      ds1:
+    #        type: com.alibaba.druid.pool.DruidDataSource
+    #        driver-class-name: com.mysql.jdbc.Driver
+    #        url: jdbc:mysql://localhost:3306/novel_plus2
+    #        username: root
+    #        password: test123456
+    config:
+      sharding:
+        props:
+          sql.show: true
+        tables:
+          book_content: #book_content表
+            key-generator-column-name: id  #主键
+            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
+            table-strategy: #分表策略
+              inline:
+                shardingColumn: index_id
+                algorithm-expression: book_content${index_id % 10}
--- a/novel-admin/src/main/resources/application.yml
+++ b/novel-admin/src/main/resources/application.yml
@ -1,8 +1,8 @@
 server:
  session-timeout: 18000
-#    tomcat:
-#        max-threads: 1000
-#        min-spare-threads: 30
+  #    tomcat:
+  #        max-threads: 1000
+  #        min-spare-threads: 30
  port: 80
 #    uri-encoding: utf-8
 #security:
@ -15,19 +15,20 @@ spring:
  jackson:
    time-zone: GMT+8
    date-format: yyyy-MM-dd HH:mm:ss
-  profiles: 
+  profiles:
    active: dev
+  
+  #上传文件的最大值（10M）
  servlet:
    multipart:
-      max-file-size: 30Mb
-      max-request-size: 30Mb
+      max-file-size: 10485760
+        
  devtools:
    restart:
      enabled: true
-  cache:
-    type: ehcache
-    ehcache:
-      config: classpath:ehcache.xml
+  main:
+    allow-bean-definition-overriding: true
+
 mybatis:
  configuration:
    #自动将数据库带下划线的表字段值映射到Java类的驼峰字段上
@ -36,3 +37,7 @@ mybatis:
  typeAliasesPackage: com.java2nb.**.domain
 #[弃用]配置缓存和session存储方式，默认ehcache,可选redis,[弃用]调整至 spring cache type【shiro.用户，权限，session，spring.cache通用】
 #[弃用]cacheType: ehcache
+
+
+logging:
+  config: classpath:logback-boot.xml
--- a/novel-admin/src/main/resources/banner.txt
+++ b/novel-admin/src/main/resources/banner.txt
@ -1,6 +1,15 @@
-     __                     ________       ___.
-    |__|____ ___  _______   \_____  \  ____\_ |__
-    |  \__  \\  \/ /\__  \   /  ____/ /    \| __ \
-    |  |/ __ \\   /  / __ \_/       \|   |  \ \_\ \
-/\__|  (____  /\_/  (____  /\_______ \___|  /___  /
-\______|    \/           \/         \/    \/    \/
+${AnsiColor.CYAN}
+
+--------------------------------------------------------------------------------
+${AnsiColor.RED}
+||   / |  / /
+||  /  | / /  ___     //  ___      ___      _   __
+|| / /||/ / //___) ) // //   ) ) //   ) ) // ) )  ) )
+||/ / |  / //       // //       //   / / // / /  / /
+|  /  | / ((____   // ((____   ((___/ / // / /  / /   小说精品屋欢迎您！！！
+
+                                               -------Powered By XXY
+${AnsiColor.CYAN}
+--------------------------------------------------------------------------------
+${AnsiColor.BRIGHT_YELLOW}
+::: Spring-Boot ${spring-boot.formatted-version} :::
--- a/novel-admin/src/main/resources/logback-spring.xml
+++ b/novel-admin/src/main/resources/logback-spring.xml
@ -24,7 +24,7 @@
    <!-- RollingFileAppender：滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 -->
    <!-- 以下的大概意思是：1.先按日期存日志，日期变了，将前一天的日志文件名重命名为XXX%日期%索引，新的日志仍然是demo.log -->
    <!-- 2.如果日期没有发生变化，但是当前日志的文件大小超过1KB时，对当前日志进行分割 重命名 -->
-    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">

        <File>logs/debug.log</File>
        <!-- rollingPolicy:当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名。 -->
@ -52,11 +52,13 @@
    <!-- 控制台输出日志级别 -->
    <root level="INFO">
        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
    </root>
    <!-- 指定项目中某个包，当有日志操作行为时的日志记录级别 -->
    <!-- com.maijinjie.springboot 为根包，也就是只要是发生在这个根包下面的所有日志操作行为的权限都是DEBUG -->
    <!-- 级别依次为【从高到低】：FATAL > ERROR > WARN > INFO > DEBUG > TRACE -->
-    <logger name="com.java2nb" level="DEBUG">
-        <appender-ref ref="debug" />
+    <logger name="com.java2nb" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
    </logger>
 </configuration>
--- a/novel-admin/src/main/resources/mybatis/common/DictMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/common/DictMapper.xml
@ -3,130 +3,140 @@

 <mapper namespace="com.java2nb.common.dao.DictDao">

-	<select id="get" resultType="com.java2nb.common.domain.DictDO">
-		select
-		`id`,`name`,`value`,`type`,`description`,`sort`,`parent_id`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`
-		from sys_dict where id = #{value}
-	</select>
+    <select id="get" resultType="com.java2nb.common.domain.DictDO">
+        select `id`,
+               `name`,
+               `value`,
+               `type`,
+               `description`,
+               `sort`,
+               `parent_id`,
+               `create_by`,
+               `create_date`,
+               `update_by`,
+               `update_date`,
+               `remarks`,
+               `del_flag`
+        from sys_dict
+        where id = #{value}
+    </select>

-	<select id="list" resultType="com.java2nb.common.domain.DictDO">
-		select
-		`id`,`name`,`value`,`type`,`description`,`sort`,`parent_id`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`
-		from sys_dict
-		<where>
-			<if test="id != null and id != ''"> and id = #{id} </if>
-			<if test="name != null and name != ''"> and name = #{name} </if>
-			<if test="value != null and value != ''"> and value = #{value} </if>
-			<if test="type != null and type != ''"> and type = #{type} </if>
-			<if test="description != null and description != ''"> and description = #{description} </if>
-			<if test="sort != null and sort != ''"> and sort = #{sort} </if>
-			<if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
-			<if test="createBy != null and createBy != ''"> and create_by = #{createBy} </if>
-			<if test="createDate != null and createDate != ''"> and create_date = #{createDate} </if>
-			<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy} </if>
-			<if test="updateDate != null and updateDate != ''"> and update_date = #{updateDate} </if>
-			<if test="remarks != null and remarks != ''"> and remarks = #{remarks} </if>
-			<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag} </if>
-		</where>
-		<choose>
-			<when test="sort != null and sort.trim() != ''">
-				order by ${sort} ${order}
-			</when>
-			<otherwise>
-				order by id desc
-			</otherwise>
-		</choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
+    <select id="list" resultType="com.java2nb.common.domain.DictDO">
+        select
+        `id`,`name`,`value`,`type`,`description`,`sort`,`parent_id`,`create_by`,`create_date`,`update_by`,`update_date`,`remarks`,`del_flag`
+        from sys_dict
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="value != null and value != ''">and value = #{value}</if>
+            <if test="type != null and type != ''">and type = #{type}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="sort != null and sort != ''">and sort = #{sort}</if>
+            <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createDate != null and createDate != ''">and create_date = #{createDate}</if>
+            <if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateDate != null and updateDate != ''">and update_date = #{updateDate}</if>
+            <if test="remarks != null and remarks != ''">and remarks = #{remarks}</if>
+            <if test="delFlag != null and delFlag != ''">and del_flag = #{delFlag}</if>
+        </where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>

-	<select id="count" resultType="int">
-		select count(*) from sys_dict
-		<where>
-			<if test="id != null and id != ''"> and id = #{id} </if>
-			<if test="name != null and name != ''"> and name = #{name} </if>
-			<if test="value != null and value != ''"> and value = #{value} </if>
-			<if test="type != null and type != ''"> and type = #{type} </if>
-			<if test="description != null and description != ''"> and description = #{description} </if>
-			<if test="sort != null and sort != ''"> and sort = #{sort} </if>
-			<if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
-			<if test="createBy != null and createBy != ''"> and create_by = #{createBy} </if>
-			<if test="createDate != null and createDate != ''"> and create_date = #{createDate} </if>
-			<if test="updateBy != null and updateBy != ''"> and update_by = #{updateBy} </if>
-			<if test="updateDate != null and updateDate != ''"> and update_date = #{updateDate} </if>
-			<if test="remarks != null and remarks != ''"> and remarks = #{remarks} </if>
-			<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag} </if>
-		</where>
-	</select>
+    <select id="count" resultType="int">
+        select count(*) from sys_dict
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="value != null and value != ''">and value = #{value}</if>
+            <if test="type != null and type != ''">and type = #{type}</if>
+            <if test="description != null and description != ''">and description = #{description}</if>
+            <if test="sort != null and sort != ''">and sort = #{sort}</if>
+            <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="createBy != null and createBy != ''">and create_by = #{createBy}</if>
+            <if test="createDate != null and createDate != ''">and create_date = #{createDate}</if>
+            <if test="updateBy != null and updateBy != ''">and update_by = #{updateBy}</if>
+            <if test="updateDate != null and updateDate != ''">and update_date = #{updateDate}</if>
+            <if test="remarks != null and remarks != ''">and remarks = #{remarks}</if>
+            <if test="delFlag != null and delFlag != ''">and del_flag = #{delFlag}</if>
+        </where>
+    </select>

-	<insert id="save" parameterType="com.java2nb.common.domain.DictDO"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into sys_dict
-		(
-		`name`,
-		`value`,
-		`type`,
-		`description`,
-		`sort`,
-		`parent_id`,
-		`create_by`,
-		`create_date`,
-		`update_by`,
-		`update_date`,
-		`remarks`,
-		`del_flag`
-		)
-		values
-		(
-		#{name},
-		#{value},
-		#{type},
-		#{description},
-		#{sort},
-		#{parentId},
-		#{createBy},
-		#{createDate},
-		#{updateBy},
-		#{updateDate},
-		#{remarks},
-		#{delFlag}
-		)
-	</insert>
+    <insert id="save" parameterType="com.java2nb.common.domain.DictDO"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into sys_dict
+        (`name`,
+         `value`,
+         `type`,
+         `description`,
+         `sort`,
+         `parent_id`,
+         `create_by`,
+         `create_date`,
+         `update_by`,
+         `update_date`,
+         `remarks`,
+         `del_flag`)
+        values (#{name},
+                #{value},
+                #{type},
+                #{description},
+                #{sort},
+                #{parentId},
+                #{createBy},
+                #{createDate},
+                #{updateBy},
+                #{updateDate},
+                #{remarks},
+                #{delFlag})
+    </insert>

-	<update id="update" parameterType="com.java2nb.common.domain.DictDO">
-		update sys_dict
-		<set>
-			<if test="name != null">`name` = #{name}, </if>
-			<if test="value != null">`value` = #{value}, </if>
-			<if test="type != null">`type` = #{type}, </if>
-			<if test="description != null">`description` = #{description}, </if>
-			<if test="sort != null">`sort` = #{sort}, </if>
-			<if test="parentId != null">`parent_id` = #{parentId}, </if>
-			<if test="createBy != null">`create_by` = #{createBy}, </if>
-			<if test="createDate != null">`create_date` = #{createDate}, </if>
-			<if test="updateBy != null">`update_by` = #{updateBy}, </if>
-			<if test="updateDate != null">`update_date` = #{updateDate}, </if>
-			<if test="remarks != null">`remarks` = #{remarks}, </if>
-			<if test="delFlag != null">`del_flag` = #{delFlag}</if>
-		</set>
-		where id = #{id}
-	</update>
+    <update id="update" parameterType="com.java2nb.common.domain.DictDO">
+        update sys_dict
+        <set>
+            <if test="name != null">`name` = #{name},</if>
+            <if test="value != null">`value` = #{value},</if>
+            <if test="type != null">`type` = #{type},</if>
+            <if test="description != null">`description` = #{description},</if>
+            <if test="sort != null">`sort` = #{sort},</if>
+            <if test="parentId != null">`parent_id` = #{parentId},</if>
+            <if test="createBy != null">`create_by` = #{createBy},</if>
+            <if test="createDate != null">`create_date` = #{createDate},</if>
+            <if test="updateBy != null">`update_by` = #{updateBy},</if>
+            <if test="updateDate != null">`update_date` = #{updateDate},</if>
+            <if test="remarks != null">`remarks` = #{remarks},</if>
+            <if test="delFlag != null">`del_flag` = #{delFlag}</if>
+        </set>
+        where id = #{id}
+    </update>

-	<delete id="remove">
-		delete from sys_dict where id = #{value}
-	</delete>
+    <delete id="remove">
+        delete
+        from sys_dict
+        where id = #{value}
+    </delete>

-	<delete id="batchRemove">
-		delete from sys_dict where id in
-		<foreach item="id" collection="array" open="(" separator=","
-			close=")">
-			#{id}
-		</foreach>
-	</delete>
+    <delete id="batchRemove">
+        delete from sys_dict where id in
+        <foreach item="id" collection="array" open="(" separator=","
+                 close=")">
+            #{id}
+        </foreach>
+    </delete>

-	<select id="listType" resultType="com.java2nb.common.domain.DictDO">
-		select distinct `type` , description from sys_dict
-	</select>
+    <select id="listType" resultType="com.java2nb.common.domain.DictDO">
+        select `type`, description
+        from sys_dict
+    </select>

 </mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/BookCommentMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/BookCommentMapper.xml
@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.BookCommentDao">
+
+	<select id="get" resultType="com.java2nb.novel.domain.BookCommentDO">
+		select `id`,`book_id`,`comment_content`,`reply_count`,`audit_status`,`create_time`,`create_user_id` from book_comment where id = #{value}
+	</select>
+
+	<select id="list" resultType="com.java2nb.novel.domain.BookCommentDO">
+		select `id`,`book_id`,`comment_content`,`reply_count`,`audit_status`,`create_time`,`create_user_id` from book_comment
+        <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="bookId != null and bookId != ''"> and book_id = #{bookId} </if>
+		  		  <if test="commentContent != null and commentContent != ''"> and comment_content = #{commentContent} </if>
+		  		  <if test="replyCount != null and replyCount != ''"> and reply_count = #{replyCount} </if>
+		  		  <if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		  <if test="createUserId != null and createUserId != ''"> and create_user_id = #{createUserId} </if>
+		  		</where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="count" resultType="int">
+		select count(*) from book_comment
+		 <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="bookId != null and bookId != ''"> and book_id = #{bookId} </if>
+		  		  <if test="commentContent != null and commentContent != ''"> and comment_content = #{commentContent} </if>
+		  		  <if test="replyCount != null and replyCount != ''"> and reply_count = #{replyCount} </if>
+		  		  <if test="auditStatus != null and auditStatus != ''"> and audit_status = #{auditStatus} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		  <if test="createUserId != null and createUserId != ''"> and create_user_id = #{createUserId} </if>
+		  		</where>
+	</select>
+	 
+	<insert id="save" parameterType="com.java2nb.novel.domain.BookCommentDO">
+		insert into book_comment
+		(
+			`id`, 
+			`book_id`, 
+			`comment_content`, 
+			`reply_count`, 
+			`audit_status`, 
+			`create_time`, 
+			`create_user_id`
+		)
+		values
+		(
+			#{id}, 
+			#{bookId}, 
+			#{commentContent}, 
+			#{replyCount}, 
+			#{auditStatus}, 
+			#{createTime}, 
+			#{createUserId}
+		)
+	</insert>
+
+	<insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookCommentDO">
+		insert into book_comment
+		(
+					<if test="id != null"> `id`,  </if>
+					<if test="bookId != null"> `book_id`,  </if>
+					<if test="commentContent != null"> `comment_content`,  </if>
+					<if test="replyCount != null"> `reply_count`,  </if>
+					<if test="auditStatus != null"> `audit_status`,  </if>
+					<if test="createTime != null"> `create_time`,  </if>
+					<if test="createUserId != null"> `create_user_id` </if>
+				)
+		values
+		(
+					<if test="id != null"> #{id},  </if>
+					<if test="bookId != null"> #{bookId},  </if>
+					<if test="commentContent != null"> #{commentContent},  </if>
+					<if test="replyCount != null"> #{replyCount},  </if>
+					<if test="auditStatus != null"> #{auditStatus},  </if>
+					<if test="createTime != null"> #{createTime},  </if>
+					<if test="createUserId != null"> #{createUserId} </if>
+				)
+	</insert>
+	 
+	<update id="update" parameterType="com.java2nb.novel.domain.BookCommentDO">
+		update book_comment 
+		<set>
+			<if test="bookId != null">`book_id` = #{bookId}, </if>
+			<if test="commentContent != null">`comment_content` = #{commentContent}, </if>
+			<if test="replyCount != null">`reply_count` = #{replyCount}, </if>
+			<if test="auditStatus != null">`audit_status` = #{auditStatus}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createUserId != null">`create_user_id` = #{createUserId}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="remove">
+		delete from book_comment where id = #{value}
+	</delete>
+	
+	<delete id="batchRemove">
+		delete from book_comment where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/BookContentMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/BookContentMapper.xml
@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.BookContentDao">
+
+    <select id="get" resultType="com.java2nb.novel.domain.BookContentDO">
+        select `id`, `index_id`, `content`
+        from book_content
+        where id = #{value}
+    </select>
+
+    <select id="list" resultType="com.java2nb.novel.domain.BookContentDO">
+        select `id`,`index_id`,`content` from book_content
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="indexId != null and indexId != ''">and index_id = #{indexId}</if>
+            <if test="content != null and content != ''">and content = #{content}</if>
+        </where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="count" resultType="int">
+        select count(*) from book_content
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="indexId != null and indexId != ''">and index_id = #{indexId}</if>
+            <if test="content != null and content != ''">and content = #{content}</if>
+        </where>
+    </select>
+
+    <insert id="save" parameterType="com.java2nb.novel.domain.BookContentDO">
+        insert into book_content
+        (`id`,
+         `index_id`,
+         `content`)
+        values (#{id},
+                #{indexId},
+                #{content})
+    </insert>
+
+    <insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookContentDO">
+        insert into book_content
+        (
+        <if test="id != null">`id`,</if>
+        <if test="indexId != null">`index_id`,</if>
+        <if test="content != null">`content`</if>
+        )
+        values
+        (
+        <if test="id != null">#{id},</if>
+        <if test="indexId != null">#{indexId},</if>
+        <if test="content != null">#{content}</if>
+        )
+    </insert>
+
+    <update id="update" parameterType="com.java2nb.novel.domain.BookContentDO">
+        update book_content
+        <set>
+            <if test="indexId != null">`index_id` = #{indexId},</if>
+            <if test="content != null">`content` = #{content}</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="remove">
+        delete
+        from book_content
+        where id = #{value}
+    </delete>
+
+    <delete id="batchRemove">
+        delete from book_content where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    <delete id="removeByIndexIds">
+        delete from book_content where index_id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/BookIndexMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/BookIndexMapper.xml
@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.BookIndexDao">
+
+    <select id="get" resultType="com.java2nb.novel.domain.BookIndexDO">
+        select `id`,
+               `book_id`,
+               `index_num`,
+               `index_name`,
+               `word_count`,
+               `is_vip`,
+               `book_price`,
+               `storage_type`,
+               `create_time`,
+               `update_time`
+        from book_index
+        where id = #{value}
+    </select>
+
+    <select id="list" resultType="com.java2nb.novel.domain.BookIndexDO">
+        select
+        `id`,`book_id`,`index_num`,`index_name`,`word_count`,`is_vip`,`book_price`,`storage_type`,`create_time`,`update_time`
+        from book_index
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="bookId != null and bookId != ''">and book_id = #{bookId}</if>
+            <if test="indexNum != null and indexNum != ''">and index_num = #{indexNum}</if>
+            <if test="indexName != null and indexName != ''">and index_name = #{indexName}</if>
+            <if test="wordCount != null and wordCount != ''">and word_count = #{wordCount}</if>
+            <if test="isVip != null and isVip != ''">and is_vip = #{isVip}</if>
+            <if test="bookPrice != null and bookPrice != ''">and book_price = #{bookPrice}</if>
+            <if test="storageType != null and storageType != ''">and storage_type = #{storageType}</if>
+            <if test="createTime != null and createTime != ''">and create_time = #{createTime}</if>
+            <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if>
+        </where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+            <otherwise>
+                order by id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>
+
+    <select id="count" resultType="int">
+        select count(*) from book_index
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="bookId != null and bookId != ''">and book_id = #{bookId}</if>
+            <if test="indexNum != null and indexNum != ''">and index_num = #{indexNum}</if>
+            <if test="indexName != null and indexName != ''">and index_name = #{indexName}</if>
+            <if test="wordCount != null and wordCount != ''">and word_count = #{wordCount}</if>
+            <if test="isVip != null and isVip != ''">and is_vip = #{isVip}</if>
+            <if test="bookPrice != null and bookPrice != ''">and book_price = #{bookPrice}</if>
+            <if test="storageType != null and storageType != ''">and storage_type = #{storageType}</if>
+            <if test="createTime != null and createTime != ''">and create_time = #{createTime}</if>
+            <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if>
+        </where>
+    </select>
+    <select id="getIdsByBookId" resultType="java.lang.Long">
+        select id
+        from book_index
+        where book_id = #{bookId}
+    </select>
+
+    <insert id="save" parameterType="com.java2nb.novel.domain.BookIndexDO">
+        insert into book_index
+        (`id`,
+         `book_id`,
+         `index_num`,
+         `index_name`,
+         `word_count`,
+         `is_vip`,
+         `book_price`,
+         `storage_type`,
+         `create_time`,
+         `update_time`)
+        values (#{id},
+                #{bookId},
+                #{indexNum},
+                #{indexName},
+                #{wordCount},
+                #{isVip},
+                #{bookPrice},
+                #{storageType},
+                #{createTime},
+                #{updateTime})
+    </insert>
+
+    <insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookIndexDO">
+        insert into book_index
+        (
+        <if test="id != null">`id`,</if>
+        <if test="bookId != null">`book_id`,</if>
+        <if test="indexNum != null">`index_num`,</if>
+        <if test="indexName != null">`index_name`,</if>
+        <if test="wordCount != null">`word_count`,</if>
+        <if test="isVip != null">`is_vip`,</if>
+        <if test="bookPrice != null">`book_price`,</if>
+        <if test="storageType != null">`storage_type`,</if>
+        <if test="createTime != null">`create_time`,</if>
+        <if test="updateTime != null">`update_time`</if>
+        )
+        values
+        (
+        <if test="id != null">#{id},</if>
+        <if test="bookId != null">#{bookId},</if>
+        <if test="indexNum != null">#{indexNum},</if>
+        <if test="indexName != null">#{indexName},</if>
+        <if test="wordCount != null">#{wordCount},</if>
+        <if test="isVip != null">#{isVip},</if>
+        <if test="bookPrice != null">#{bookPrice},</if>
+        <if test="storageType != null">#{storageType},</if>
+        <if test="createTime != null">#{createTime},</if>
+        <if test="updateTime != null">#{updateTime}</if>
+        )
+    </insert>
+
+    <update id="update" parameterType="com.java2nb.novel.domain.BookIndexDO">
+        update book_index
+        <set>
+            <if test="bookId != null">`book_id` = #{bookId},</if>
+            <if test="indexNum != null">`index_num` = #{indexNum},</if>
+            <if test="indexName != null">`index_name` = #{indexName},</if>
+            <if test="wordCount != null">`word_count` = #{wordCount},</if>
+            <if test="isVip != null">`is_vip` = #{isVip},</if>
+            <if test="bookPrice != null">`book_price` = #{bookPrice},</if>
+            <if test="storageType != null">`storage_type` = #{storageType},</if>
+            <if test="createTime != null">`create_time` = #{createTime},</if>
+            <if test="updateTime != null">`update_time` = #{updateTime}</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="remove">
+        delete
+        from book_index
+        where id = #{value}
+    </delete>
+
+    <delete id="batchRemove">
+        delete from book_index where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/BookMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/BookMapper.xml
@ -3,304 +3,295 @@

 <mapper namespace="com.java2nb.novel.dao.BookDao">

-	<select id="get" resultType="com.java2nb.novel.domain.BookDO">
-		select `id`,`work_direction`,`cat_id`,`cat_name`,`cat_child_id`,`cat_child_name`,`pic_url`,`book_name`,`hero_name`,`lady_name`,`book_style`,`book_label`,`author_id`,`author_name`,`book_desc`,`score`,`book_status`,`visit_count`,`word_count`,`comment_count`,`yesterday_buy`,`last_index_id`,`last_index_name`,`last_index_update_time`,`is_vip`,`status`,`update_time`,`create_time`,`crawl_source_id`,`crawl_book_id`,`crawl_last_time`,`crawl_is_stop` from book where id = #{value}
-	</select>
+    <select id="get" resultType="com.java2nb.novel.domain.BookDO">
+        select `id`,
+               `work_direction`,
+               `cat_id`,
+               `cat_name`,
+               `pic_url`,
+               `book_name`,
+               `author_id`,
+               `author_name`,
+               `book_desc`,
+               `score`,
+               `book_status`,
+               `visit_count`,
+               `word_count`,
+               `comment_count`,
+               `yesterday_buy`,
+               `last_index_id`,
+               `last_index_name`,
+               `last_index_update_time`,
+               `is_vip`,
+               `status`,
+               `update_time`,
+               `create_time`,
+               `crawl_source_id`,
+               `crawl_book_id`,
+               `crawl_last_time`,
+               `crawl_is_stop`
+        from book
+        where id = #{value}
+    </select>

-	<select id="list" resultType="com.java2nb.novel.domain.BookDO">
-		select `id`,`work_direction`,`cat_id`,`cat_name`,`cat_child_id`,`cat_child_name`,`pic_url`,`book_name`,`hero_name`,`lady_name`,`book_style`,`book_label`,`author_id`,`author_name`,`book_desc`,`score`,`book_status`,`visit_count`,`word_count`,`comment_count`,`yesterday_buy`,`last_index_id`,`last_index_name`,`last_index_update_time`,`is_vip`,`status`,`update_time`,`create_time`,`crawl_source_id`,`crawl_book_id`,`crawl_last_time`,`crawl_is_stop` from book
-        <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="workDirection != null and workDirection != ''"> and work_direction = #{workDirection} </if>
-		  		  <if test="catId != null and catId != ''"> and cat_id = #{catId} </if>
-		  		  <if test="catName != null and catName != ''"> and cat_name = #{catName} </if>
-		  		  <if test="catChildId != null and catChildId != ''"> and cat_child_id = #{catChildId} </if>
-		  		  <if test="catChildName != null and catChildName != ''"> and cat_child_name = #{catChildName} </if>
-		  		  <if test="picUrl != null and picUrl != ''"> and pic_url = #{picUrl} </if>
-		  		  <if test="bookName != null and bookName != ''"> and book_name = #{bookName} </if>
-		  		  <if test="heroName != null and heroName != ''"> and hero_name = #{heroName} </if>
-		  		  <if test="ladyName != null and ladyName != ''"> and lady_name = #{ladyName} </if>
-		  		  <if test="bookStyle != null and bookStyle != ''"> and book_style = #{bookStyle} </if>
-		  		  <if test="bookLabel != null and bookLabel != ''"> and book_label = #{bookLabel} </if>
-		  		  <if test="authorId != null and authorId != ''"> and author_id = #{authorId} </if>
-		  		  <if test="authorName != null and authorName != ''"> and author_name = #{authorName} </if>
-		  		  <if test="bookDesc != null and bookDesc != ''"> and book_desc = #{bookDesc} </if>
-		  		  <if test="score != null and score != ''"> and score = #{score} </if>
-		  		  <if test="bookStatus != null and bookStatus != ''"> and book_status = #{bookStatus} </if>
-		  		  <if test="visitCount != null and visitCount != ''"> and visit_count = #{visitCount} </if>
-		  		  <if test="wordCount != null and wordCount != ''"> and word_count = #{wordCount} </if>
-		  		  <if test="commentCount != null and commentCount != ''"> and comment_count = #{commentCount} </if>
-		  		  <if test="yesterdayBuy != null and yesterdayBuy != ''"> and yesterday_buy = #{yesterdayBuy} </if>
-		  		  <if test="lastIndexId != null and lastIndexId != ''"> and last_index_id = #{lastIndexId} </if>
-		  		  <if test="lastIndexName != null and lastIndexName != ''"> and last_index_name = #{lastIndexName} </if>
-		  		  <if test="lastIndexUpdateTime != null and lastIndexUpdateTime != ''"> and last_index_update_time = #{lastIndexUpdateTime} </if>
-		  		  <if test="isVip != null and isVip != ''"> and is_vip = #{isVip} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="crawlSourceId != null and crawlSourceId != ''"> and crawl_source_id = #{crawlSourceId} </if>
-		  		  <if test="crawlBookId != null and crawlBookId != ''"> and crawl_book_id = #{crawlBookId} </if>
-		  		  <if test="crawlLastTime != null and crawlLastTime != ''"> and crawl_last_time = #{crawlLastTime} </if>
-		  		  <if test="crawlIsStop != null and crawlIsStop != ''"> and crawl_is_stop = #{crawlIsStop} </if>
-		  		</where>
+    <select id="list" resultType="com.java2nb.novel.domain.BookDO">
+        select
+        `id`,`work_direction`,`cat_id`,`cat_name`,`pic_url`,`book_name`,`author_id`,`author_name`,`book_desc`,`score`,`book_status`,`visit_count`,`word_count`,`comment_count`,`yesterday_buy`,`last_index_id`,`last_index_name`,`last_index_update_time`,`is_vip`,`status`,`update_time`,`create_time`,`crawl_source_id`,`crawl_book_id`,`crawl_last_time`,`crawl_is_stop`
+        from book
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="workDirection != null and workDirection != ''">and work_direction = #{workDirection}</if>
+            <if test="catId != null and catId != ''">and cat_id = #{catId}</if>
+            <if test="catName != null and catName != ''">and cat_name = #{catName}</if>
+            <if test="picUrl != null and picUrl != ''">and pic_url = #{picUrl}</if>
+            <if test="bookName != null and bookName != ''">and book_name = #{bookName}</if>
+            <if test="authorId != null and authorId != ''">and author_id = #{authorId}</if>
+            <if test="authorName != null and authorName != ''">and author_name = #{authorName}</if>
+            <if test="bookDesc != null and bookDesc != ''">and book_desc = #{bookDesc}</if>
+            <if test="score != null and score != ''">and score = #{score}</if>
+            <if test="bookStatus != null and bookStatus != ''">and book_status = #{bookStatus}</if>
+            <if test="visitCount != null and visitCount != ''">and visit_count = #{visitCount}</if>
+            <if test="wordCount != null and wordCount != ''">and word_count = #{wordCount}</if>
+            <if test="commentCount != null and commentCount != ''">and comment_count = #{commentCount}</if>
+            <if test="yesterdayBuy != null and yesterdayBuy != ''">and yesterday_buy = #{yesterdayBuy}</if>
+            <if test="lastIndexId != null and lastIndexId != ''">and last_index_id = #{lastIndexId}</if>
+            <if test="lastIndexName != null and lastIndexName != ''">and last_index_name = #{lastIndexName}</if>
+            <if test="lastIndexUpdateTime != null and lastIndexUpdateTime != ''">and last_index_update_time =
+                #{lastIndexUpdateTime}
+            </if>
+            <if test="isVip != null and isVip != ''">and is_vip = #{isVip}</if>
+            <if test="status != null and status != ''">and status = #{status}</if>
+            <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if>
+            <if test="createTime != null and createTime != ''">and create_time = #{createTime}</if>
+            <if test="crawlSourceId != null and crawlSourceId != ''">and crawl_source_id = #{crawlSourceId}</if>
+            <if test="crawlBookId != null and crawlBookId != ''">and crawl_book_id = #{crawlBookId}</if>
+            <if test="crawlLastTime != null and crawlLastTime != ''">and crawl_last_time = #{crawlLastTime}</if>
+            <if test="crawlIsStop != null and crawlIsStop != ''">and crawl_is_stop = #{crawlIsStop}</if>
+        </where>
        <choose>
            <when test="sort != null and sort.trim() != ''">
                order by ${sort} ${order}
            </when>
-			<otherwise>
+            <otherwise>
                order by id desc
-			</otherwise>
+            </otherwise>
        </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
-	
- 	<select id="count" resultType="int">
-		select count(*) from book
-		 <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="workDirection != null and workDirection != ''"> and work_direction = #{workDirection} </if>
-		  		  <if test="catId != null and catId != ''"> and cat_id = #{catId} </if>
-		  		  <if test="catName != null and catName != ''"> and cat_name = #{catName} </if>
-		  		  <if test="catChildId != null and catChildId != ''"> and cat_child_id = #{catChildId} </if>
-		  		  <if test="catChildName != null and catChildName != ''"> and cat_child_name = #{catChildName} </if>
-		  		  <if test="picUrl != null and picUrl != ''"> and pic_url = #{picUrl} </if>
-		  		  <if test="bookName != null and bookName != ''"> and book_name = #{bookName} </if>
-		  		  <if test="heroName != null and heroName != ''"> and hero_name = #{heroName} </if>
-		  		  <if test="ladyName != null and ladyName != ''"> and lady_name = #{ladyName} </if>
-		  		  <if test="bookStyle != null and bookStyle != ''"> and book_style = #{bookStyle} </if>
-		  		  <if test="bookLabel != null and bookLabel != ''"> and book_label = #{bookLabel} </if>
-		  		  <if test="authorId != null and authorId != ''"> and author_id = #{authorId} </if>
-		  		  <if test="authorName != null and authorName != ''"> and author_name = #{authorName} </if>
-		  		  <if test="bookDesc != null and bookDesc != ''"> and book_desc = #{bookDesc} </if>
-		  		  <if test="score != null and score != ''"> and score = #{score} </if>
-		  		  <if test="bookStatus != null and bookStatus != ''"> and book_status = #{bookStatus} </if>
-		  		  <if test="visitCount != null and visitCount != ''"> and visit_count = #{visitCount} </if>
-		  		  <if test="wordCount != null and wordCount != ''"> and word_count = #{wordCount} </if>
-		  		  <if test="commentCount != null and commentCount != ''"> and comment_count = #{commentCount} </if>
-		  		  <if test="yesterdayBuy != null and yesterdayBuy != ''"> and yesterday_buy = #{yesterdayBuy} </if>
-		  		  <if test="lastIndexId != null and lastIndexId != ''"> and last_index_id = #{lastIndexId} </if>
-		  		  <if test="lastIndexName != null and lastIndexName != ''"> and last_index_name = #{lastIndexName} </if>
-		  		  <if test="lastIndexUpdateTime != null and lastIndexUpdateTime != ''"> and last_index_update_time = #{lastIndexUpdateTime} </if>
-		  		  <if test="isVip != null and isVip != ''"> and is_vip = #{isVip} </if>
-		  		  <if test="status != null and status != ''"> and status = #{status} </if>
-		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="crawlSourceId != null and crawlSourceId != ''"> and crawl_source_id = #{crawlSourceId} </if>
-		  		  <if test="crawlBookId != null and crawlBookId != ''"> and crawl_book_id = #{crawlBookId} </if>
-		  		  <if test="crawlLastTime != null and crawlLastTime != ''"> and crawl_last_time = #{crawlLastTime} </if>
-		  		  <if test="crawlIsStop != null and crawlIsStop != ''"> and crawl_is_stop = #{crawlIsStop} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.java2nb.novel.domain.BookDO">
-		insert into book
-		(
-			`id`, 
-			`work_direction`, 
-			`cat_id`, 
-			`cat_name`, 
-			`cat_child_id`, 
-			`cat_child_name`, 
-			`pic_url`, 
-			`book_name`, 
-			`hero_name`, 
-			`lady_name`, 
-			`book_style`, 
-			`book_label`, 
-			`author_id`, 
-			`author_name`, 
-			`book_desc`, 
-			`score`, 
-			`book_status`, 
-			`visit_count`, 
-			`word_count`, 
-			`comment_count`, 
-			`yesterday_buy`, 
-			`last_index_id`, 
-			`last_index_name`, 
-			`last_index_update_time`, 
-			`is_vip`, 
-			`status`, 
-			`update_time`, 
-			`create_time`, 
-			`crawl_source_id`, 
-			`crawl_book_id`, 
-			`crawl_last_time`, 
-			`crawl_is_stop`
-		)
-		values
-		(
-			#{id}, 
-			#{workDirection}, 
-			#{catId}, 
-			#{catName}, 
-			#{catChildId}, 
-			#{catChildName}, 
-			#{picUrl}, 
-			#{bookName}, 
-			#{heroName}, 
-			#{ladyName}, 
-			#{bookStyle}, 
-			#{bookLabel}, 
-			#{authorId}, 
-			#{authorName}, 
-			#{bookDesc}, 
-			#{score}, 
-			#{bookStatus}, 
-			#{visitCount}, 
-			#{wordCount}, 
-			#{commentCount}, 
-			#{yesterdayBuy}, 
-			#{lastIndexId}, 
-			#{lastIndexName}, 
-			#{lastIndexUpdateTime}, 
-			#{isVip}, 
-			#{status}, 
-			#{updateTime}, 
-			#{createTime}, 
-			#{crawlSourceId}, 
-			#{crawlBookId}, 
-			#{crawlLastTime}, 
-			#{crawlIsStop}
-		)
-	</insert>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>

-	<insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookDO">
-		insert into book
-		(
-					<if test="id != null"> `id`,  </if>
-					<if test="workDirection != null"> `work_direction`,  </if>
-					<if test="catId != null"> `cat_id`,  </if>
-					<if test="catName != null"> `cat_name`,  </if>
-					<if test="catChildId != null"> `cat_child_id`,  </if>
-					<if test="catChildName != null"> `cat_child_name`,  </if>
-					<if test="picUrl != null"> `pic_url`,  </if>
-					<if test="bookName != null"> `book_name`,  </if>
-					<if test="heroName != null"> `hero_name`,  </if>
-					<if test="ladyName != null"> `lady_name`,  </if>
-					<if test="bookStyle != null"> `book_style`,  </if>
-					<if test="bookLabel != null"> `book_label`,  </if>
-					<if test="authorId != null"> `author_id`,  </if>
-					<if test="authorName != null"> `author_name`,  </if>
-					<if test="bookDesc != null"> `book_desc`,  </if>
-					<if test="score != null"> `score`,  </if>
-					<if test="bookStatus != null"> `book_status`,  </if>
-					<if test="visitCount != null"> `visit_count`,  </if>
-					<if test="wordCount != null"> `word_count`,  </if>
-					<if test="commentCount != null"> `comment_count`,  </if>
-					<if test="yesterdayBuy != null"> `yesterday_buy`,  </if>
-					<if test="lastIndexId != null"> `last_index_id`,  </if>
-					<if test="lastIndexName != null"> `last_index_name`,  </if>
-					<if test="lastIndexUpdateTime != null"> `last_index_update_time`,  </if>
-					<if test="isVip != null"> `is_vip`,  </if>
-					<if test="status != null"> `status`,  </if>
-					<if test="updateTime != null"> `update_time`,  </if>
-					<if test="createTime != null"> `create_time`,  </if>
-					<if test="crawlSourceId != null"> `crawl_source_id`,  </if>
-					<if test="crawlBookId != null"> `crawl_book_id`,  </if>
-					<if test="crawlLastTime != null"> `crawl_last_time`,  </if>
-					<if test="crawlIsStop != null"> `crawl_is_stop` </if>
-				)
-		values
-		(
-					<if test="id != null"> #{id},  </if>
-					<if test="workDirection != null"> #{workDirection},  </if>
-					<if test="catId != null"> #{catId},  </if>
-					<if test="catName != null"> #{catName},  </if>
-					<if test="catChildId != null"> #{catChildId},  </if>
-					<if test="catChildName != null"> #{catChildName},  </if>
-					<if test="picUrl != null"> #{picUrl},  </if>
-					<if test="bookName != null"> #{bookName},  </if>
-					<if test="heroName != null"> #{heroName},  </if>
-					<if test="ladyName != null"> #{ladyName},  </if>
-					<if test="bookStyle != null"> #{bookStyle},  </if>
-					<if test="bookLabel != null"> #{bookLabel},  </if>
-					<if test="authorId != null"> #{authorId},  </if>
-					<if test="authorName != null"> #{authorName},  </if>
-					<if test="bookDesc != null"> #{bookDesc},  </if>
-					<if test="score != null"> #{score},  </if>
-					<if test="bookStatus != null"> #{bookStatus},  </if>
-					<if test="visitCount != null"> #{visitCount},  </if>
-					<if test="wordCount != null"> #{wordCount},  </if>
-					<if test="commentCount != null"> #{commentCount},  </if>
-					<if test="yesterdayBuy != null"> #{yesterdayBuy},  </if>
-					<if test="lastIndexId != null"> #{lastIndexId},  </if>
-					<if test="lastIndexName != null"> #{lastIndexName},  </if>
-					<if test="lastIndexUpdateTime != null"> #{lastIndexUpdateTime},  </if>
-					<if test="isVip != null"> #{isVip},  </if>
-					<if test="status != null"> #{status},  </if>
-					<if test="updateTime != null"> #{updateTime},  </if>
-					<if test="createTime != null"> #{createTime},  </if>
-					<if test="crawlSourceId != null"> #{crawlSourceId},  </if>
-					<if test="crawlBookId != null"> #{crawlBookId},  </if>
-					<if test="crawlLastTime != null"> #{crawlLastTime},  </if>
-					<if test="crawlIsStop != null"> #{crawlIsStop} </if>
-				)
-	</insert>
-	 
-	<update id="update" parameterType="com.java2nb.novel.domain.BookDO">
-		update book 
-		<set>
-			<if test="workDirection != null">`work_direction` = #{workDirection}, </if>
-			<if test="catId != null">`cat_id` = #{catId}, </if>
-			<if test="catName != null">`cat_name` = #{catName}, </if>
-			<if test="catChildId != null">`cat_child_id` = #{catChildId}, </if>
-			<if test="catChildName != null">`cat_child_name` = #{catChildName}, </if>
-			<if test="picUrl != null">`pic_url` = #{picUrl}, </if>
-			<if test="bookName != null">`book_name` = #{bookName}, </if>
-			<if test="heroName != null">`hero_name` = #{heroName}, </if>
-			<if test="ladyName != null">`lady_name` = #{ladyName}, </if>
-			<if test="bookStyle != null">`book_style` = #{bookStyle}, </if>
-			<if test="bookLabel != null">`book_label` = #{bookLabel}, </if>
-			<if test="authorId != null">`author_id` = #{authorId}, </if>
-			<if test="authorName != null">`author_name` = #{authorName}, </if>
-			<if test="bookDesc != null">`book_desc` = #{bookDesc}, </if>
-			<if test="score != null">`score` = #{score}, </if>
-			<if test="bookStatus != null">`book_status` = #{bookStatus}, </if>
-			<if test="visitCount != null">`visit_count` = #{visitCount}, </if>
-			<if test="wordCount != null">`word_count` = #{wordCount}, </if>
-			<if test="commentCount != null">`comment_count` = #{commentCount}, </if>
-			<if test="yesterdayBuy != null">`yesterday_buy` = #{yesterdayBuy}, </if>
-			<if test="lastIndexId != null">`last_index_id` = #{lastIndexId}, </if>
-			<if test="lastIndexName != null">`last_index_name` = #{lastIndexName}, </if>
-			<if test="lastIndexUpdateTime != null">`last_index_update_time` = #{lastIndexUpdateTime}, </if>
-			<if test="isVip != null">`is_vip` = #{isVip}, </if>
-			<if test="status != null">`status` = #{status}, </if>
-			<if test="updateTime != null">`update_time` = #{updateTime}, </if>
-			<if test="createTime != null">`create_time` = #{createTime}, </if>
-			<if test="crawlSourceId != null">`crawl_source_id` = #{crawlSourceId}, </if>
-			<if test="crawlBookId != null">`crawl_book_id` = #{crawlBookId}, </if>
-			<if test="crawlLastTime != null">`crawl_last_time` = #{crawlLastTime}, </if>
-			<if test="crawlIsStop != null">`crawl_is_stop` = #{crawlIsStop}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="remove">
-		delete from book where id = #{value}
-	</delete>
-	
-	<delete id="batchRemove">
-		delete from book where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
+    <select id="count" resultType="int">
+        select count(*) from book
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="workDirection != null and workDirection != ''">and work_direction = #{workDirection}</if>
+            <if test="catId != null and catId != ''">and cat_id = #{catId}</if>
+            <if test="catName != null and catName != ''">and cat_name = #{catName}</if>
+            <if test="picUrl != null and picUrl != ''">and pic_url = #{picUrl}</if>
+            <if test="bookName != null and bookName != ''">and book_name = #{bookName}</if>
+            <if test="authorId != null and authorId != ''">and author_id = #{authorId}</if>
+            <if test="authorName != null and authorName != ''">and author_name = #{authorName}</if>
+            <if test="bookDesc != null and bookDesc != ''">and book_desc = #{bookDesc}</if>
+            <if test="score != null and score != ''">and score = #{score}</if>
+            <if test="bookStatus != null and bookStatus != ''">and book_status = #{bookStatus}</if>
+            <if test="visitCount != null and visitCount != ''">and visit_count = #{visitCount}</if>
+            <if test="wordCount != null and wordCount != ''">and word_count = #{wordCount}</if>
+            <if test="commentCount != null and commentCount != ''">and comment_count = #{commentCount}</if>
+            <if test="yesterdayBuy != null and yesterdayBuy != ''">and yesterday_buy = #{yesterdayBuy}</if>
+            <if test="lastIndexId != null and lastIndexId != ''">and last_index_id = #{lastIndexId}</if>
+            <if test="lastIndexName != null and lastIndexName != ''">and last_index_name = #{lastIndexName}</if>
+            <if test="lastIndexUpdateTime != null and lastIndexUpdateTime != ''">and last_index_update_time =
+                #{lastIndexUpdateTime}
+            </if>
+            <if test="isVip != null and isVip != ''">and is_vip = #{isVip}</if>
+            <if test="status != null and status != ''">and status = #{status}</if>
+            <if test="updateTime != null and updateTime != ''">and update_time = #{updateTime}</if>
+            <if test="createTime != null and createTime != ''">and create_time = #{createTime}</if>
+            <if test="crawlSourceId != null and crawlSourceId != ''">and crawl_source_id = #{crawlSourceId}</if>
+            <if test="crawlBookId != null and crawlBookId != ''">and crawl_book_id = #{crawlBookId}</if>
+            <if test="crawlLastTime != null and crawlLastTime != ''">and crawl_last_time = #{crawlLastTime}</if>
+            <if test="crawlIsStop != null and crawlIsStop != ''">and crawl_is_stop = #{crawlIsStop}</if>
+        </where>
+    </select>

-	<select id="tableSta" resultType="map">
-    SELECT
-	DATE_FORMAT( create_time, "%Y-%m-%d" ) AS staDate,
-	COUNT( 1 ) bookCount
-    FROM
-    book
-    WHERE
-        create_time >= #{minDate}
-    GROUP BY
-        DATE_FORMAT( create_time, "%Y-%m-%d" )
-    ORDER BY
-        staDate
-	</select>
+    <insert id="save" parameterType="com.java2nb.novel.domain.BookDO">
+        insert into book
+        (`id`,
+         `work_direction`,
+         `cat_id`,
+         `cat_name`,
+         `pic_url`,
+         `book_name`,
+         `author_id`,
+         `author_name`,
+         `book_desc`,
+         `score`,
+         `book_status`,
+         `visit_count`,
+         `word_count`,
+         `comment_count`,
+         `yesterday_buy`,
+         `last_index_id`,
+         `last_index_name`,
+         `last_index_update_time`,
+         `is_vip`,
+         `status`,
+         `update_time`,
+         `create_time`,
+         `crawl_source_id`,
+         `crawl_book_id`,
+         `crawl_last_time`,
+         `crawl_is_stop`)
+        values (#{id},
+                #{workDirection},
+                #{catId},
+                #{catName},
+                #{picUrl},
+                #{bookName},
+                #{authorId},
+                #{authorName},
+                #{bookDesc},
+                #{score},
+                #{bookStatus},
+                #{visitCount},
+                #{wordCount},
+                #{commentCount},
+                #{yesterdayBuy},
+                #{lastIndexId},
+                #{lastIndexName},
+                #{lastIndexUpdateTime},
+                #{isVip},
+                #{status},
+                #{updateTime},
+                #{createTime},
+                #{crawlSourceId},
+                #{crawlBookId},
+                #{crawlLastTime},
+                #{crawlIsStop})
+    </insert>
+
+    <insert id="saveSelective" parameterType="com.java2nb.novel.domain.BookDO">
+        insert into book
+        (
+        <if test="id != null">`id`,</if>
+        <if test="workDirection != null">`work_direction`,</if>
+        <if test="catId != null">`cat_id`,</if>
+        <if test="catName != null">`cat_name`,</if>
+        <if test="picUrl != null">`pic_url`,</if>
+        <if test="bookName != null">`book_name`,</if>
+        <if test="authorId != null">`author_id`,</if>
+        <if test="authorName != null">`author_name`,</if>
+        <if test="bookDesc != null">`book_desc`,</if>
+        <if test="score != null">`score`,</if>
+        <if test="bookStatus != null">`book_status`,</if>
+        <if test="visitCount != null">`visit_count`,</if>
+        <if test="wordCount != null">`word_count`,</if>
+        <if test="commentCount != null">`comment_count`,</if>
+        <if test="yesterdayBuy != null">`yesterday_buy`,</if>
+        <if test="lastIndexId != null">`last_index_id`,</if>
+        <if test="lastIndexName != null">`last_index_name`,</if>
+        <if test="lastIndexUpdateTime != null">`last_index_update_time`,</if>
+        <if test="isVip != null">`is_vip`,</if>
+        <if test="status != null">`status`,</if>
+        <if test="updateTime != null">`update_time`,</if>
+        <if test="createTime != null">`create_time`,</if>
+        <if test="crawlSourceId != null">`crawl_source_id`,</if>
+        <if test="crawlBookId != null">`crawl_book_id`,</if>
+        <if test="crawlLastTime != null">`crawl_last_time`,</if>
+        <if test="crawlIsStop != null">`crawl_is_stop`</if>
+        )
+        values
+        (
+        <if test="id != null">#{id},</if>
+        <if test="workDirection != null">#{workDirection},</if>
+        <if test="catId != null">#{catId},</if>
+        <if test="catName != null">#{catName},</if>
+        <if test="picUrl != null">#{picUrl},</if>
+        <if test="bookName != null">#{bookName},</if>
+        <if test="authorId != null">#{authorId},</if>
+        <if test="authorName != null">#{authorName},</if>
+        <if test="bookDesc != null">#{bookDesc},</if>
+        <if test="score != null">#{score},</if>
+        <if test="bookStatus != null">#{bookStatus},</if>
+        <if test="visitCount != null">#{visitCount},</if>
+        <if test="wordCount != null">#{wordCount},</if>
+        <if test="commentCount != null">#{commentCount},</if>
+        <if test="yesterdayBuy != null">#{yesterdayBuy},</if>
+        <if test="lastIndexId != null">#{lastIndexId},</if>
+        <if test="lastIndexName != null">#{lastIndexName},</if>
+        <if test="lastIndexUpdateTime != null">#{lastIndexUpdateTime},</if>
+        <if test="isVip != null">#{isVip},</if>
+        <if test="status != null">#{status},</if>
+        <if test="updateTime != null">#{updateTime},</if>
+        <if test="createTime != null">#{createTime},</if>
+        <if test="crawlSourceId != null">#{crawlSourceId},</if>
+        <if test="crawlBookId != null">#{crawlBookId},</if>
+        <if test="crawlLastTime != null">#{crawlLastTime},</if>
+        <if test="crawlIsStop != null">#{crawlIsStop}</if>
+        )
+    </insert>
+
+    <update id="update" parameterType="com.java2nb.novel.domain.BookDO">
+        update book
+        <set>
+            <if test="workDirection != null">`work_direction` = #{workDirection},</if>
+            <if test="catId != null">`cat_id` = #{catId},</if>
+            <if test="catName != null">`cat_name` = #{catName},</if>
+            <if test="picUrl != null">`pic_url` = #{picUrl},</if>
+            <if test="bookName != null">`book_name` = #{bookName},</if>
+            <if test="authorId != null">`author_id` = #{authorId},</if>
+            <if test="authorName != null">`author_name` = #{authorName},</if>
+            <if test="bookDesc != null">`book_desc` = #{bookDesc},</if>
+            <if test="score != null">`score` = #{score},</if>
+            <if test="bookStatus != null">`book_status` = #{bookStatus},</if>
+            <if test="visitCount != null">`visit_count` = #{visitCount},</if>
+            <if test="wordCount != null">`word_count` = #{wordCount},</if>
+            <if test="commentCount != null">`comment_count` = #{commentCount},</if>
+            <if test="yesterdayBuy != null">`yesterday_buy` = #{yesterdayBuy},</if>
+            <if test="lastIndexId != null">`last_index_id` = #{lastIndexId},</if>
+            <if test="lastIndexName != null">`last_index_name` = #{lastIndexName},</if>
+            <if test="lastIndexUpdateTime != null">`last_index_update_time` = #{lastIndexUpdateTime},</if>
+            <if test="isVip != null">`is_vip` = #{isVip},</if>
+            <if test="status != null">`status` = #{status},</if>
+            <if test="updateTime != null">`update_time` = #{updateTime},</if>
+            <if test="createTime != null">`create_time` = #{createTime},</if>
+            <if test="crawlSourceId != null">`crawl_source_id` = #{crawlSourceId},</if>
+            <if test="crawlBookId != null">`crawl_book_id` = #{crawlBookId},</if>
+            <if test="crawlLastTime != null">`crawl_last_time` = #{crawlLastTime},</if>
+            <if test="crawlIsStop != null">`crawl_is_stop` = #{crawlIsStop}</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="remove">
+        delete
+        from book
+        where id = #{value}
+    </delete>
+
+    <delete id="batchRemove">
+        delete from book where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="tableSta" resultType="map">
+        SELECT DATE_FORMAT(create_time, "%Y-%m-%d") AS staDate,
+               COUNT(1)                                bookCount
+        FROM book
+        WHERE create_time >= #{minDate}
+        GROUP BY DATE_FORMAT(create_time, "%Y-%m-%d")
+        ORDER BY staDate
+    </select>
+    <select id="batchGet" resultType="com.java2nb.novel.domain.BookDO">
+        select
+        `id`,`work_direction`,`cat_id`,`cat_name`,`pic_url`,`book_name`,`author_id`,`author_name`,`book_desc`,`score`,`book_status`,`visit_count`,`word_count`,`comment_count`,`yesterday_buy`,`last_index_id`,`last_index_name`,`last_index_update_time`,`is_vip`,`status`,`update_time`,`create_time`,`crawl_source_id`,`crawl_book_id`,`crawl_last_time`,`crawl_is_stop`
+        from book where id in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>

 </mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/FriendLinkMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/FriendLinkMapper.xml
@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.FriendLinkDao">
+
+	<select id="get" resultType="com.java2nb.novel.domain.FriendLinkDO">
+		select `id`,`link_name`,`link_url`,`sort`,`is_open`,`create_user_id`,`create_time`,`update_user_id`,`update_time` from friend_link where id = #{value}
+	</select>
+
+	<select id="list" resultType="com.java2nb.novel.domain.FriendLinkDO">
+		select `id`,`link_name`,`link_url`,`sort`,`is_open`,`create_user_id`,`create_time`,`update_user_id`,`update_time` from friend_link
+        <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="linkName != null and linkName != ''"> and link_name = #{linkName} </if>
+		  		  <if test="linkUrl != null and linkUrl != ''"> and link_url = #{linkUrl} </if>
+		  		  <if test="sort != null and sort != ''"> and sort = #{sort} </if>
+		  		  <if test="isOpen != null and isOpen != ''"> and is_open = #{isOpen} </if>
+		  		  <if test="createUserId != null and createUserId != ''"> and create_user_id = #{createUserId} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		  <if test="updateUserId != null and updateUserId != ''"> and update_user_id = #{updateUserId} </if>
+		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
+		  		</where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="count" resultType="int">
+		select count(*) from friend_link
+		 <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="linkName != null and linkName != ''"> and link_name = #{linkName} </if>
+		  		  <if test="linkUrl != null and linkUrl != ''"> and link_url = #{linkUrl} </if>
+		  		  <if test="sort != null and sort != ''"> and sort = #{sort} </if>
+		  		  <if test="isOpen != null and isOpen != ''"> and is_open = #{isOpen} </if>
+		  		  <if test="createUserId != null and createUserId != ''"> and create_user_id = #{createUserId} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		  <if test="updateUserId != null and updateUserId != ''"> and update_user_id = #{updateUserId} </if>
+		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
+		  		</where>
+	</select>
+	 
+	<insert id="save" parameterType="com.java2nb.novel.domain.FriendLinkDO">
+		insert into friend_link
+		(
+			`id`, 
+			`link_name`, 
+			`link_url`, 
+			`sort`, 
+			`is_open`, 
+			`create_user_id`, 
+			`create_time`, 
+			`update_user_id`, 
+			`update_time`
+		)
+		values
+		(
+			#{id}, 
+			#{linkName}, 
+			#{linkUrl}, 
+			#{sort}, 
+			#{isOpen}, 
+			#{createUserId}, 
+			#{createTime}, 
+			#{updateUserId}, 
+			#{updateTime}
+		)
+	</insert>
+
+	<insert id="saveSelective" parameterType="com.java2nb.novel.domain.FriendLinkDO">
+		insert into friend_link
+		(
+					<if test="id != null"> `id`,  </if>
+					<if test="linkName != null"> `link_name`,  </if>
+					<if test="linkUrl != null"> `link_url`,  </if>
+					<if test="sort != null"> `sort`,  </if>
+					<if test="isOpen != null"> `is_open`,  </if>
+					<if test="createUserId != null"> `create_user_id`,  </if>
+					<if test="createTime != null"> `create_time`,  </if>
+					<if test="updateUserId != null"> `update_user_id`,  </if>
+					<if test="updateTime != null"> `update_time` </if>
+				)
+		values
+		(
+					<if test="id != null"> #{id},  </if>
+					<if test="linkName != null"> #{linkName},  </if>
+					<if test="linkUrl != null"> #{linkUrl},  </if>
+					<if test="sort != null"> #{sort},  </if>
+					<if test="isOpen != null"> #{isOpen},  </if>
+					<if test="createUserId != null"> #{createUserId},  </if>
+					<if test="createTime != null"> #{createTime},  </if>
+					<if test="updateUserId != null"> #{updateUserId},  </if>
+					<if test="updateTime != null"> #{updateTime} </if>
+				)
+	</insert>
+	 
+	<update id="update" parameterType="com.java2nb.novel.domain.FriendLinkDO">
+		update friend_link 
+		<set>
+			<if test="linkName != null">`link_name` = #{linkName}, </if>
+			<if test="linkUrl != null">`link_url` = #{linkUrl}, </if>
+			<if test="sort != null">`sort` = #{sort}, </if>
+			<if test="isOpen != null">`is_open` = #{isOpen}, </if>
+			<if test="createUserId != null">`create_user_id` = #{createUserId}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="updateUserId != null">`update_user_id` = #{updateUserId}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="remove">
+		delete from friend_link where id = #{value}
+	</delete>
+	
+	<delete id="batchRemove">
+		delete from friend_link where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/UserMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/UserMapper.xml
@ -4,8 +4,19 @@
 <mapper namespace="com.java2nb.novel.dao.UserDao">

    <select id="get" resultType="com.java2nb.novel.domain.UserDO">
-		select `id`,`username`,`password`,`nick_name`,`user_photo`,`user_sex`,`account_balance`,`status`,`create_time`,`update_time` from user where id = #{value}
-	</select>
+        select `id`,
+               `username`,
+               `password`,
+               `nick_name`,
+               `user_photo`,
+               `user_sex`,
+               `account_balance`,
+               `status`,
+               `create_time`,
+               `update_time`
+        from user
+        where id = #{value}
+    </select>

    <select id="list" resultType="com.java2nb.novel.domain.UserDO">
        select
@ -53,33 +64,28 @@
    </select>

    <insert id="save" parameterType="com.java2nb.novel.domain.UserDO">
-		insert into user
-		(
-			`id`, 
-			`username`, 
-			`password`, 
-			`nick_name`, 
-			`user_photo`, 
-			`user_sex`, 
-			`account_balance`, 
-			`status`, 
-			`create_time`, 
-			`update_time`
-		)
-		values
-		(
-			#{id}, 
-			#{username}, 
-			#{password}, 
-			#{nickName}, 
-			#{userPhoto}, 
-			#{userSex}, 
-			#{accountBalance}, 
-			#{status}, 
-			#{createTime}, 
-			#{updateTime}
-		)
-	</insert>
+        insert into user
+        (`id`,
+         `username`,
+         `password`,
+         `nick_name`,
+         `user_photo`,
+         `user_sex`,
+         `account_balance`,
+         `status`,
+         `create_time`,
+         `update_time`)
+        values (#{id},
+                #{username},
+                #{password},
+                #{nickName},
+                #{userPhoto},
+                #{userSex},
+                #{accountBalance},
+                #{status},
+                #{createTime},
+                #{updateTime})
+    </insert>

    <insert id="saveSelective" parameterType="com.java2nb.novel.domain.UserDO">
        insert into user
@ -127,8 +133,10 @@
    </update>

    <delete id="remove">
-		delete from user where id = #{value}
-	</delete>
+        delete
+        from user
+        where id = #{value}
+    </delete>

    <delete id="batchRemove">
        delete from user where id in
@ -138,17 +146,20 @@
    </delete>

    <select id="tableSta" resultType="map">
-    SELECT
-	DATE_FORMAT( create_time, "%Y-%m-%d" ) AS staDate,
-	COUNT( 1 ) userCount
-    FROM
-    user
-    WHERE
-        create_time >= #{minDate}
-    GROUP BY
-        DATE_FORMAT( create_time, "%Y-%m-%d" )
-    ORDER BY
-        staDate
-	</select>
+        SELECT DATE_FORMAT(create_time, "%Y-%m-%d") AS staDate,
+               COUNT(1)                                userCount
+        FROM user
+        WHERE create_time >= #{minDate}
+        GROUP BY DATE_FORMAT(create_time, "%Y-%m-%d")
+        ORDER BY staDate
+    </select>
+    <select id="batchGet" resultType="com.java2nb.novel.domain.UserDO">
+        select
+        `id`,`username`,`password`,`nick_name`,`user_photo`,`user_sex`,`account_balance`,`status`,`create_time`,`update_time`
+        from user where id in
+        <foreach item="id" collection="list" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>

 </mapper>
--- a/novel-admin/src/main/resources/mybatis/novel/WebsiteInfoMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/novel/WebsiteInfoMapper.xml
@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.java2nb.novel.dao.WebsiteInfoDao">
+
+	<select id="get" resultType="com.java2nb.novel.domain.WebsiteInfoDO">
+		select `id`,`name`,`domain`,`keyword`,`description`,`qq`,`logo`,`logo_dark`,`create_time`,`create_user_id`,`update_time`,`update_user_id` from website_info where id = #{value}
+	</select>
+
+	<select id="list" resultType="com.java2nb.novel.domain.WebsiteInfoDO">
+		select `id`,`name`,`domain`,`keyword`,`description`,`qq`,`logo`,`logo_dark`,`create_time`,`create_user_id`,`update_time`,`update_user_id` from website_info
+        <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="name != null and name != ''"> and name = #{name} </if>
+		  		  <if test="domain != null and domain != ''"> and domain = #{domain} </if>
+		  		  <if test="keyword != null and keyword != ''"> and keyword = #{keyword} </if>
+		  		  <if test="description != null and description != ''"> and description = #{description} </if>
+		  		  <if test="qq != null and qq != ''"> and qq = #{qq} </if>
+		  		  <if test="logo != null and logo != ''"> and logo = #{logo} </if>
+		  		  <if test="logoDark != null and logoDark != ''"> and logo_dark = #{logoDark} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		  <if test="createUserId != null and createUserId != ''"> and create_user_id = #{createUserId} </if>
+		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
+		  		  <if test="updateUserId != null and updateUserId != ''"> and update_user_id = #{updateUserId} </if>
+		  		</where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+			<otherwise>
+                order by id desc
+			</otherwise>
+        </choose>
+		<if test="offset != null and limit != null">
+			limit #{offset}, #{limit}
+		</if>
+	</select>
+	
+ 	<select id="count" resultType="int">
+		select count(*) from website_info
+		 <where>  
+		  		  <if test="id != null and id != ''"> and id = #{id} </if>
+		  		  <if test="name != null and name != ''"> and name = #{name} </if>
+		  		  <if test="domain != null and domain != ''"> and domain = #{domain} </if>
+		  		  <if test="keyword != null and keyword != ''"> and keyword = #{keyword} </if>
+		  		  <if test="description != null and description != ''"> and description = #{description} </if>
+		  		  <if test="qq != null and qq != ''"> and qq = #{qq} </if>
+		  		  <if test="logo != null and logo != ''"> and logo = #{logo} </if>
+		  		  <if test="logoDark != null and logoDark != ''"> and logo_dark = #{logoDark} </if>
+		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
+		  		  <if test="createUserId != null and createUserId != ''"> and create_user_id = #{createUserId} </if>
+		  		  <if test="updateTime != null and updateTime != ''"> and update_time = #{updateTime} </if>
+		  		  <if test="updateUserId != null and updateUserId != ''"> and update_user_id = #{updateUserId} </if>
+		  		</where>
+	</select>
+	 
+	<insert id="save" parameterType="com.java2nb.novel.domain.WebsiteInfoDO">
+		insert into website_info
+		(
+			`id`, 
+			`name`, 
+			`domain`, 
+			`keyword`, 
+			`description`, 
+			`qq`, 
+			`logo`, 
+			`logo_dark`, 
+			`create_time`, 
+			`create_user_id`, 
+			`update_time`, 
+			`update_user_id`
+		)
+		values
+		(
+			#{id}, 
+			#{name}, 
+			#{domain}, 
+			#{keyword}, 
+			#{description}, 
+			#{qq}, 
+			#{logo}, 
+			#{logoDark}, 
+			#{createTime}, 
+			#{createUserId}, 
+			#{updateTime}, 
+			#{updateUserId}
+		)
+	</insert>
+
+	<insert id="saveSelective" parameterType="com.java2nb.novel.domain.WebsiteInfoDO">
+		insert into website_info
+		(
+					<if test="id != null"> `id`,  </if>
+					<if test="name != null"> `name`,  </if>
+					<if test="domain != null"> `domain`,  </if>
+					<if test="keyword != null"> `keyword`,  </if>
+					<if test="description != null"> `description`,  </if>
+					<if test="qq != null"> `qq`,  </if>
+					<if test="logo != null"> `logo`,  </if>
+					<if test="logoDark != null"> `logo_dark`,  </if>
+					<if test="createTime != null"> `create_time`,  </if>
+					<if test="createUserId != null"> `create_user_id`,  </if>
+					<if test="updateTime != null"> `update_time`,  </if>
+					<if test="updateUserId != null"> `update_user_id` </if>
+				)
+		values
+		(
+					<if test="id != null"> #{id},  </if>
+					<if test="name != null"> #{name},  </if>
+					<if test="domain != null"> #{domain},  </if>
+					<if test="keyword != null"> #{keyword},  </if>
+					<if test="description != null"> #{description},  </if>
+					<if test="qq != null"> #{qq},  </if>
+					<if test="logo != null"> #{logo},  </if>
+					<if test="logoDark != null"> #{logoDark},  </if>
+					<if test="createTime != null"> #{createTime},  </if>
+					<if test="createUserId != null"> #{createUserId},  </if>
+					<if test="updateTime != null"> #{updateTime},  </if>
+					<if test="updateUserId != null"> #{updateUserId} </if>
+				)
+	</insert>
+	 
+	<update id="update" parameterType="com.java2nb.novel.domain.WebsiteInfoDO">
+		update website_info 
+		<set>
+			<if test="name != null">`name` = #{name}, </if>
+			<if test="domain != null">`domain` = #{domain}, </if>
+			<if test="keyword != null">`keyword` = #{keyword}, </if>
+			<if test="description != null">`description` = #{description}, </if>
+			<if test="qq != null">`qq` = #{qq}, </if>
+			<if test="logo != null">`logo` = #{logo}, </if>
+			<if test="logoDark != null">`logo_dark` = #{logoDark}, </if>
+			<if test="createTime != null">`create_time` = #{createTime}, </if>
+			<if test="createUserId != null">`create_user_id` = #{createUserId}, </if>
+			<if test="updateTime != null">`update_time` = #{updateTime}, </if>
+			<if test="updateUserId != null">`update_user_id` = #{updateUserId}</if>
+		</set>
+		where id = #{id}
+	</update>
+	
+	<delete id="remove">
+		delete from website_info where id = #{value}
+	</delete>
+	
+	<delete id="batchRemove">
+		delete from website_info where id in 
+		<foreach item="id" collection="array" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</delete>
+
+</mapper>
--- a/novel-admin/src/main/resources/mybatis/system/DataPermMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/system/DataPermMapper.xml
@ -3,149 +3,161 @@

 <mapper namespace="com.java2nb.system.dao.DataPermDao">

-	<select id="get" resultType="com.java2nb.system.domain.DataPermDO">
-		select `id`,`name`,`table_name`,`module_name`,`crl_attr_name`,`crl_column_name`,`perm_code`,`order_num`,`gmt_create`,`gmt_modified` from sys_data_perm where id = #{value}
-	</select>
+    <select id="get" resultType="com.java2nb.system.domain.DataPermDO">
+        select `id`,
+               `name`,
+               `table_name`,
+               `module_name`,
+               `crl_attr_name`,
+               `crl_column_name`,
+               `perm_code`,
+               `order_num`,
+               `gmt_create`,
+               `gmt_modified`
+        from sys_data_perm
+        where id = #{value}
+    </select>

-	<select id="list" resultType="com.java2nb.system.domain.DataPermDO">
-		select `id`,`name`,`table_name`,`module_name`,`crl_attr_name`,`crl_column_name`,`perm_code`,`order_num`,`gmt_create`,`gmt_modified` from sys_data_perm
-        <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="name != null and name != ''"> and name = #{name} </if>
-		  		  <if test="tableName != null and tableName != ''"> and table_name = #{tableName} </if>
-		  		  <if test="moduleName != null and moduleName != ''"> and module_name = #{moduleName} </if>
-		  		  <if test="crlAttrName != null and crlAttrName != ''"> and crl_attr_name = #{crlAttrName} </if>
-		  		  <if test="crlColumnName != null and crlColumnName != ''"> and crl_column_name = #{crlColumnName} </if>
-		  		  <if test="permCode != null and permCode != ''"> and perm_code = #{permCode} </if>
-		  		  <if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum} </if>
-		  		  <if test="gmtCreate != null and gmtCreate != ''"> and gmt_create = #{gmtCreate} </if>
-		  		  <if test="gmtModified != null and gmtModified != ''"> and gmt_modified = #{gmtModified} </if>
-		  		</where>
+    <select id="list" resultType="com.java2nb.system.domain.DataPermDO">
+        select
+        `id`,`name`,`table_name`,`module_name`,`crl_attr_name`,`crl_column_name`,`perm_code`,`order_num`,`gmt_create`,`gmt_modified`
+        from sys_data_perm
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="tableName != null and tableName != ''">and table_name = #{tableName}</if>
+            <if test="moduleName != null and moduleName != ''">and module_name = #{moduleName}</if>
+            <if test="crlAttrName != null and crlAttrName != ''">and crl_attr_name = #{crlAttrName}</if>
+            <if test="crlColumnName != null and crlColumnName != ''">and crl_column_name = #{crlColumnName}</if>
+            <if test="permCode != null and permCode != ''">and perm_code = #{permCode}</if>
+            <if test="orderNum != null and orderNum != ''">and order_num = #{orderNum}</if>
+            <if test="gmtCreate != null and gmtCreate != ''">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtModified != null and gmtModified != ''">and gmt_modified = #{gmtModified}</if>
+        </where>
        <choose>
            <when test="sort != null and sort.trim() != ''">
                order by ${sort} ${order}
            </when>
-			<otherwise>
+            <otherwise>
                order by id desc
-			</otherwise>
+            </otherwise>
        </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
-	
- 	<select id="count" resultType="int">
-		select count(*) from sys_data_perm
-		 <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="name != null and name != ''"> and name = #{name} </if>
-		  		  <if test="tableName != null and tableName != ''"> and table_name = #{tableName} </if>
-		  		  <if test="moduleName != null and moduleName != ''"> and module_name = #{moduleName} </if>
-		  		  <if test="crlAttrName != null and crlAttrName != ''"> and crl_attr_name = #{crlAttrName} </if>
-		  		  <if test="crlColumnName != null and crlColumnName != ''"> and crl_column_name = #{crlColumnName} </if>
-		  		  <if test="permCode != null and permCode != ''"> and perm_code = #{permCode} </if>
-		  		  <if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum} </if>
-		  		  <if test="gmtCreate != null and gmtCreate != ''"> and gmt_create = #{gmtCreate} </if>
-		  		  <if test="gmtModified != null and gmtModified != ''"> and gmt_modified = #{gmtModified} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.java2nb.system.domain.DataPermDO" useGeneratedKeys="true" keyProperty="id">
-		insert into sys_data_perm
-		(
-			`name`, 
-			`table_name`, 
-			`module_name`, 
-			`crl_attr_name`, 
-			`crl_column_name`, 
-			`perm_code`, 
-			`order_num`, 
-			`gmt_create`, 
-			`gmt_modified`
-		)
-		values
-		(
-			#{name}, 
-			#{tableName}, 
-			#{moduleName}, 
-			#{crlAttrName}, 
-			#{crlColumnName}, 
-			#{permCode}, 
-			#{orderNum}, 
-			#{gmtCreate}, 
-			#{gmtModified}
-		)
-	</insert>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>

-	<insert id="saveSelective" parameterType="com.java2nb.system.domain.DataPermDO" useGeneratedKeys="true" keyProperty="id">
-		insert into sys_data_perm
-		(
-					<if test="id != null"> `id`,  </if>
-					<if test="name != null"> `name`,  </if>
-					<if test="tableName != null"> `table_name`,  </if>
-					<if test="moduleName != null"> `module_name`,  </if>
-					<if test="crlAttrName != null"> `crl_attr_name`,  </if>
-					<if test="crlColumnName != null"> `crl_column_name`,  </if>
-					<if test="permCode != null"> `perm_code`,  </if>
-					<if test="orderNum != null"> `order_num`,  </if>
-					<if test="gmtCreate != null"> `gmt_create`,  </if>
-					<if test="gmtModified != null"> `gmt_modified` </if>
-				)
-		values
-		(
-					<if test="id != null"> #{id},  </if>
-					<if test="name != null"> #{name},  </if>
-					<if test="tableName != null"> #{tableName},  </if>
-					<if test="moduleName != null"> #{moduleName},  </if>
-					<if test="crlAttrName != null"> #{crlAttrName},  </if>
-					<if test="crlColumnName != null"> #{crlColumnName},  </if>
-					<if test="permCode != null"> #{permCode},  </if>
-					<if test="orderNum != null"> #{orderNum},  </if>
-					<if test="gmtCreate != null"> #{gmtCreate},  </if>
-					<if test="gmtModified != null"> #{gmtModified} </if>
-				)
-	</insert>
-	 
-	<update id="update" parameterType="com.java2nb.system.domain.DataPermDO">
-		update sys_data_perm 
-		<set>
-			<if test="name != null">`name` = #{name}, </if>
-			<if test="tableName != null">`table_name` = #{tableName}, </if>
-			<if test="moduleName != null">`module_name` = #{moduleName}, </if>
-			<if test="crlAttrName != null">`crl_attr_name` = #{crlAttrName}, </if>
-			<if test="crlColumnName != null">`crl_column_name` = #{crlColumnName}, </if>
-			<if test="permCode != null">`perm_code` = #{permCode}, </if>
-			<if test="orderNum != null">`order_num` = #{orderNum}, </if>
-			<if test="gmtCreate != null">`gmt_create` = #{gmtCreate}, </if>
-			<if test="gmtModified != null">`gmt_modified` = #{gmtModified}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="remove">
-		delete from sys_data_perm where id = #{value}
-	</delete>
-	
-	<delete id="batchRemove">
-		delete from sys_data_perm where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
+    <select id="count" resultType="int">
+        select count(*) from sys_data_perm
+        <where>
+            <if test="id != null and id != ''">and id = #{id}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="tableName != null and tableName != ''">and table_name = #{tableName}</if>
+            <if test="moduleName != null and moduleName != ''">and module_name = #{moduleName}</if>
+            <if test="crlAttrName != null and crlAttrName != ''">and crl_attr_name = #{crlAttrName}</if>
+            <if test="crlColumnName != null and crlColumnName != ''">and crl_column_name = #{crlColumnName}</if>
+            <if test="permCode != null and permCode != ''">and perm_code = #{permCode}</if>
+            <if test="orderNum != null and orderNum != ''">and order_num = #{orderNum}</if>
+            <if test="gmtCreate != null and gmtCreate != ''">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtModified != null and gmtModified != ''">and gmt_modified = #{gmtModified}</if>
+        </where>
+    </select>
+
+    <insert id="save" parameterType="com.java2nb.system.domain.DataPermDO" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_data_perm
+        (`name`,
+         `table_name`,
+         `module_name`,
+         `crl_attr_name`,
+         `crl_column_name`,
+         `perm_code`,
+         `order_num`,
+         `gmt_create`,
+         `gmt_modified`)
+        values (#{name},
+                #{tableName},
+                #{moduleName},
+                #{crlAttrName},
+                #{crlColumnName},
+                #{permCode},
+                #{orderNum},
+                #{gmtCreate},
+                #{gmtModified})
+    </insert>
+
+    <insert id="saveSelective" parameterType="com.java2nb.system.domain.DataPermDO" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into sys_data_perm
+        (
+        <if test="id != null">`id`,</if>
+        <if test="name != null">`name`,</if>
+        <if test="tableName != null">`table_name`,</if>
+        <if test="moduleName != null">`module_name`,</if>
+        <if test="crlAttrName != null">`crl_attr_name`,</if>
+        <if test="crlColumnName != null">`crl_column_name`,</if>
+        <if test="permCode != null">`perm_code`,</if>
+        <if test="orderNum != null">`order_num`,</if>
+        <if test="gmtCreate != null">`gmt_create`,</if>
+        <if test="gmtModified != null">`gmt_modified`</if>
+        )
+        values
+        (
+        <if test="id != null">#{id},</if>
+        <if test="name != null">#{name},</if>
+        <if test="tableName != null">#{tableName},</if>
+        <if test="moduleName != null">#{moduleName},</if>
+        <if test="crlAttrName != null">#{crlAttrName},</if>
+        <if test="crlColumnName != null">#{crlColumnName},</if>
+        <if test="permCode != null">#{permCode},</if>
+        <if test="orderNum != null">#{orderNum},</if>
+        <if test="gmtCreate != null">#{gmtCreate},</if>
+        <if test="gmtModified != null">#{gmtModified}</if>
+        )
+    </insert>
+
+    <update id="update" parameterType="com.java2nb.system.domain.DataPermDO">
+        update sys_data_perm
+        <set>
+            <if test="name != null">`name` = #{name},</if>
+            <if test="tableName != null">`table_name` = #{tableName},</if>
+            <if test="moduleName != null">`module_name` = #{moduleName},</if>
+            <if test="crlAttrName != null">`crl_attr_name` = #{crlAttrName},</if>
+            <if test="crlColumnName != null">`crl_column_name` = #{crlColumnName},</if>
+            <if test="permCode != null">`perm_code` = #{permCode},</if>
+            <if test="orderNum != null">`order_num` = #{orderNum},</if>
+            <if test="gmtCreate != null">`gmt_create` = #{gmtCreate},</if>
+            <if test="gmtModified != null">`gmt_modified` = #{gmtModified}</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <delete id="remove">
+        delete
+        from sys_data_perm
+        where id = #{value}
+    </delete>
+
+    <delete id="batchRemove">
+        delete from sys_data_perm where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>


-	<select id="listModuleName" resultType="com.java2nb.system.domain.DataPermDO">
-		select distinct `module_name` from sys_data_perm ;
+    <select id="listModuleName" resultType="com.java2nb.system.domain.DataPermDO">
+        select `module_name`
+        from sys_data_perm;

-	</select>
+    </select>

-	<select id="selectDataPermsByUserId" parameterType="long" resultType="com.java2nb.system.domain.DataPermDO">
+    <select id="selectDataPermsByUserId" parameterType="long" resultType="com.java2nb.system.domain.DataPermDO">

-		select distinct t1.`table_name`,t1.`module_name`,t1.`crl_attr_name`,t1.`crl_column_name`,t1.`perm_code`
-		from sys_data_perm t1
-		inner join sys_role_data_perm t2 on t1.id = t2.perm_id
-		inner join sys_user_role t3 on t2.role_id = t3.role_id
-		and t3.user_id = #{userId}
-	</select>
+        select t1.`table_name`, t1.`module_name`, t1.`crl_attr_name`, t1.`crl_column_name`, t1.`perm_code`
+        from sys_data_perm t1
+                 inner join sys_role_data_perm t2 on t1.id = t2.perm_id
+                 inner join sys_user_role t3 on t2.role_id = t3.role_id
+            and t3.user_id = #{userId}
+    </select>

 </mapper>
--- a/novel-admin/src/main/resources/mybatis/system/DeptMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/system/DeptMapper.xml
@ -3,96 +3,102 @@

 <mapper namespace="com.java2nb.system.dao.DeptDao">

-	<select id="get" resultType="com.java2nb.system.domain.DeptDO">
-		select
-		`dept_id`,`parent_id`,`name`,`order_num`,`del_flag` from sys_dept
-		where dept_id = #{value}
-	</select>
+    <select id="get" resultType="com.java2nb.system.domain.DeptDO">
+        select `dept_id`,
+               `parent_id`,
+               `name`,
+               `order_num`,
+               `del_flag`
+        from sys_dept
+        where dept_id = #{value}
+    </select>

-	<select id="list" resultType="com.java2nb.system.domain.DeptDO">
-		select `dept_id`,`parent_id`,`name`,`order_num`,`del_flag` from
-		sys_dept
-		<where>
-			<if test="deptId != null and deptId != ''"> and dept_id = #{deptId} </if>
-			<if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
-			<if test="name != null and name != ''"> and name = #{name} </if>
-			<if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum} </if>
-			<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag} </if>
-		</where>
-		<choose>
-			<when test="sort != null and sort.trim() != ''">
-				order by ${sort} ${order}
-			</when>
-			<otherwise>
-				order by dept_id desc
-			</otherwise>
-		</choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
+    <select id="list" resultType="com.java2nb.system.domain.DeptDO">
+        select `dept_id`,`parent_id`,`name`,`order_num`,`del_flag` from
+        sys_dept
+        <where>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="orderNum != null and orderNum != ''">and order_num = #{orderNum}</if>
+            <if test="delFlag != null and delFlag != ''">and del_flag = #{delFlag}</if>
+        </where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+            <otherwise>
+                order by dept_id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>

-	<select id="count" resultType="int">
-		select count(*) from sys_dept
-		<where>
-			<if test="deptId != null and deptId != ''"> and dept_id = #{deptId} </if>
-			<if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
-			<if test="name != null and name != ''"> and name = #{name} </if>
-			<if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum} </if>
-			<if test="delFlag != null and delFlag != ''"> and del_flag = #{delFlag} </if>
-		</where>
-	</select>
+    <select id="count" resultType="int">
+        select count(*) from sys_dept
+        <where>
+            <if test="deptId != null and deptId != ''">and dept_id = #{deptId}</if>
+            <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="orderNum != null and orderNum != ''">and order_num = #{orderNum}</if>
+            <if test="delFlag != null and delFlag != ''">and del_flag = #{delFlag}</if>
+        </where>
+    </select>

-	<insert id="save" parameterType="com.java2nb.system.domain.DeptDO"
-		useGeneratedKeys="true" keyProperty="deptId">
-		insert into sys_dept
-		(
-		`parent_id`,
-		`name`,
-		`order_num`,
-		`del_flag`
-		)
-		values
-		(
-		#{parentId},
-		#{name},
-		#{orderNum},
-		#{delFlag}
-		)
-	</insert>
+    <insert id="save" parameterType="com.java2nb.system.domain.DeptDO"
+            useGeneratedKeys="true" keyProperty="deptId">
+        insert into sys_dept
+        (`parent_id`,
+         `name`,
+         `order_num`,
+         `del_flag`)
+        values (#{parentId},
+                #{name},
+                #{orderNum},
+                #{delFlag})
+    </insert>

-	<update id="update" parameterType="com.java2nb.system.domain.DeptDO">
-		update sys_dept
-		<set>
-			<if test="parentId != null">`parent_id` = #{parentId}, </if>
-			<if test="name != null">`name` = #{name}, </if>
-			<if test="orderNum != null">`order_num` = #{orderNum}, </if>
-			<if test="delFlag != null">`del_flag` = #{delFlag}</if>
-		</set>
-		where dept_id = #{deptId}
-	</update>
+    <update id="update" parameterType="com.java2nb.system.domain.DeptDO">
+        update sys_dept
+        <set>
+            <if test="parentId != null">`parent_id` = #{parentId},</if>
+            <if test="name != null">`name` = #{name},</if>
+            <if test="orderNum != null">`order_num` = #{orderNum},</if>
+            <if test="delFlag != null">`del_flag` = #{delFlag}</if>
+        </set>
+        where dept_id = #{deptId}
+    </update>

-	<delete id="remove">
-		delete from sys_dept where dept_id = #{value}
-	</delete>
+    <delete id="remove">
+        delete
+        from sys_dept
+        where dept_id = #{value}
+    </delete>

-	<delete id="batchRemove">
-		delete from sys_dept where dept_id in
-		<foreach item="deptId" collection="array" open="(" separator=","
-			close=")">
-			#{deptId}
-		</foreach>
-	</delete>
-	
-	<select id="listParentDept" resultType="long">
-		select DISTINCT parent_id from sys_dept
-	</select>
+    <delete id="batchRemove">
+        delete from sys_dept where dept_id in
+        <foreach item="deptId" collection="array" open="(" separator=","
+                 close=")">
+            #{deptId}
+        </foreach>
+    </delete>
+
+    <select id="listParentDept" resultType="long">
+        select parent_id
+        from sys_dept
+    </select>

    <select id="getDeptUserNumber" resultType="int">
-		select count(*) from sys_user where dept_id = #{value}
-	</select>
+        select count(*)
+        from sys_user
+        where dept_id = #{value}
+    </select>

-	<select id="getDeptIdsByParentId" parameterType="long" resultType="String">
-		select group_concat(dept_id) from sys_dept where parent_id = #{deptId}
-	</select>
+    <select id="getDeptIdsByParentId" parameterType="long" resultType="String">
+        select group_concat(dept_id)
+        from sys_dept
+        where parent_id = #{deptId}
+    </select>
 </mapper>
--- a/novel-admin/src/main/resources/mybatis/system/MenuMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/system/MenuMapper.xml
@ -3,134 +3,148 @@

 <mapper namespace="com.java2nb.system.dao.MenuDao">

-	<select id="get" resultType="com.java2nb.system.domain.MenuDO">
-		select
-		`menu_id`,`parent_id`,`name`,`url`,`perms`,`type`,`icon`,`order_num`,`gmt_create`,`gmt_modified`
-		from sys_menu where menu_id = #{value}
-	</select>
+    <select id="get" resultType="com.java2nb.system.domain.MenuDO">
+        select `menu_id`,
+               `parent_id`,
+               `name`,
+               `url`,
+               `perms`,
+               `type`,
+               `icon`,
+               `order_num`,
+               `gmt_create`,
+               `gmt_modified`
+        from sys_menu
+        where menu_id = #{value}
+    </select>

-	<select id="list" resultType="com.java2nb.system.domain.MenuDO">
-		select
-		`menu_id`,`parent_id`,`name`,`url`,`perms`,`type`,`icon`,`order_num`,`gmt_create`,`gmt_modified`
-		from sys_menu
-		<where>
-			<if test="menuId != null and menuId != ''"> and menu_id = #{menuId} </if>
-			<if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
-			<if test="name != null and name != ''"> and name = #{name} </if>
-			<if test="url != null and url != ''"> and url = #{url} </if>
-			<if test="perms != null and perms != ''"> and perms = #{perms} </if>
-			<if test="type != null and type != ''"> and type = #{type} </if>
-			<if test="icon != null and icon != ''"> and icon = #{icon} </if>
-			<if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum} </if>
-			<if test="gmtCreate != null and gmtCreate != ''"> and gmt_create = #{gmtCreate} </if>
-			<if test="gmtModified != null and gmtModified != ''"> and gmt_modified = #{gmtModified} </if>
-		</where>
-		<choose>
-			<when test="sort != null and sort.trim() != ''">
-				order by ${sort} ${order}
-			</when>
-			<otherwise>
-				order by menu_id desc
-			</otherwise>
-		</choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
+    <select id="list" resultType="com.java2nb.system.domain.MenuDO">
+        select
+        `menu_id`,`parent_id`,`name`,`url`,`perms`,`type`,`icon`,`order_num`,`gmt_create`,`gmt_modified`
+        from sys_menu
+        <where>
+            <if test="menuId != null and menuId != ''">and menu_id = #{menuId}</if>
+            <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="url != null and url != ''">and url = #{url}</if>
+            <if test="perms != null and perms != ''">and perms = #{perms}</if>
+            <if test="type != null and type != ''">and type = #{type}</if>
+            <if test="icon != null and icon != ''">and icon = #{icon}</if>
+            <if test="orderNum != null and orderNum != ''">and order_num = #{orderNum}</if>
+            <if test="gmtCreate != null and gmtCreate != ''">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtModified != null and gmtModified != ''">and gmt_modified = #{gmtModified}</if>
+        </where>
+        <choose>
+            <when test="sort != null and sort.trim() != ''">
+                order by ${sort} ${order}
+            </when>
+            <otherwise>
+                order by menu_id desc
+            </otherwise>
+        </choose>
+        <if test="offset != null and limit != null">
+            limit #{offset}, #{limit}
+        </if>
+    </select>

-	<select id="count" resultType="int">
-		select count(*) from sys_menu
-		<where>
-			<if test="menuId != null and menuId != ''"> and menu_id = #{menuId} </if>
-			<if test="parentId != null and parentId != ''"> and parent_id = #{parentId} </if>
-			<if test="name != null and name != ''"> and name = #{name} </if>
-			<if test="url != null and url != ''"> and url = #{url} </if>
-			<if test="perms != null and perms != ''"> and perms = #{perms} </if>
-			<if test="type != null and type != ''"> and type = #{type} </if>
-			<if test="icon != null and icon != ''"> and icon = #{icon} </if>
-			<if test="orderNum != null and orderNum != ''"> and order_num = #{orderNum} </if>
-			<if test="gmtCreate != null and gmtCreate != ''"> and gmt_create = #{gmtCreate} </if>
-			<if test="gmtModified != null and gmtModified != ''"> and gmt_modified = #{gmtModified} </if>
-		</where>
-	</select>
+    <select id="count" resultType="int">
+        select count(*) from sys_menu
+        <where>
+            <if test="menuId != null and menuId != ''">and menu_id = #{menuId}</if>
+            <if test="parentId != null and parentId != ''">and parent_id = #{parentId}</if>
+            <if test="name != null and name != ''">and name = #{name}</if>
+            <if test="url != null and url != ''">and url = #{url}</if>
+            <if test="perms != null and perms != ''">and perms = #{perms}</if>
+            <if test="type != null and type != ''">and type = #{type}</if>
+            <if test="icon != null and icon != ''">and icon = #{icon}</if>
+            <if test="orderNum != null and orderNum != ''">and order_num = #{orderNum}</if>
+            <if test="gmtCreate != null and gmtCreate != ''">and gmt_create = #{gmtCreate}</if>
+            <if test="gmtModified != null and gmtModified != ''">and gmt_modified = #{gmtModified}</if>
+        </where>
+    </select>

-	<insert id="save" parameterType="com.java2nb.system.domain.MenuDO"
-		useGeneratedKeys="true" keyProperty="menuId">
-		insert into sys_menu
-		(
-		`parent_id`,
-		`name`,
-		`url`,
-		`perms`,
-		`type`,
-		`icon`,
-		`order_num`,
-		`gmt_create`,
-		`gmt_modified`
-		)
-		values
-		(
-		#{parentId},
-		#{name},
-		#{url},
-		#{perms},
-		#{type},
-		#{icon},
-		#{orderNum},
-		#{gmtCreate},
-		#{gmtModified}
-		)
-	</insert>
+    <insert id="save" parameterType="com.java2nb.system.domain.MenuDO"
+            useGeneratedKeys="true" keyProperty="menuId">
+        insert into sys_menu
+        (`parent_id`,
+         `name`,
+         `url`,
+         `perms`,
+         `type`,
+         `icon`,
+         `order_num`,
+         `gmt_create`,
+         `gmt_modified`)
+        values (#{parentId},
+                #{name},
+                #{url},
+                #{perms},
+                #{type},
+                #{icon},
+                #{orderNum},
+                #{gmtCreate},
+                #{gmtModified})
+    </insert>

-	<update id="update" parameterType="com.java2nb.system.domain.MenuDO">
-		update sys_menu
-		<set>
-			<if test="parentId != null">`parent_id` = #{parentId}, </if>
-			<if test="name != null">`name` = #{name}, </if>
-			<if test="url != null">`url` = #{url}, </if>
-			<if test="perms != null">`perms` = #{perms}, </if>
-			<if test="type != null">`type` = #{type}, </if>
-			<if test="icon != null">`icon` = #{icon}, </if>
-			<if test="orderNum != null">`order_num` = #{orderNum}, </if>
-			<if test="gmtCreate != null">`gmt_create` = #{gmtCreate}, </if>
-			<if test="gmtModified != null">`gmt_modified` = #{gmtModified}</if>
-		</set>
-		where menu_id = #{menuId}
-	</update>
+    <update id="update" parameterType="com.java2nb.system.domain.MenuDO">
+        update sys_menu
+        <set>
+            <if test="parentId != null">`parent_id` = #{parentId},</if>
+            <if test="name != null">`name` = #{name},</if>
+            <if test="url != null">`url` = #{url},</if>
+            <if test="perms != null">`perms` = #{perms},</if>
+            <if test="type != null">`type` = #{type},</if>
+            <if test="icon != null">`icon` = #{icon},</if>
+            <if test="orderNum != null">`order_num` = #{orderNum},</if>
+            <if test="gmtCreate != null">`gmt_create` = #{gmtCreate},</if>
+            <if test="gmtModified != null">`gmt_modified` = #{gmtModified}</if>
+        </set>
+        where menu_id = #{menuId}
+    </update>

-	<delete id="remove">
-		delete from sys_menu where menu_id = #{value}
-	</delete>
+    <delete id="remove">
+        delete
+        from sys_menu
+        where menu_id = #{value}
+    </delete>

-	<delete id="batchRemove">
-		delete from sys_menu where menu_id in
-		<foreach item="menuId" collection="array" open="(" separator=","
-			close=")">
-			#{menuId}
-		</foreach>
-	</delete>
+    <delete id="batchRemove">
+        delete from sys_menu where menu_id in
+        <foreach item="menuId" collection="array" open="(" separator=","
+                 close=")">
+            #{menuId}
+        </foreach>
+    </delete>

-	<select id="listMenuByUserId" resultType="com.java2nb.system.domain.MenuDO">
-		select distinct
-		m.menu_id , parent_id, name, url,
-		perms,`type`,icon,order_num,gmt_create, gmt_modified
-		from sys_menu m
-		left
-		join sys_role_menu rm on m.menu_id = rm.menu_id left join
-		sys_user_role ur
-		on rm.role_id =ur.role_id where ur.user_id = #{id}
-		and
-		m.type in(0,1)
-		order by
-		m.order_num
-	</select>
+    <select id="listMenuByUserId" resultType="com.java2nb.system.domain.MenuDO">
+        select m.menu_id,
+               parent_id,
+               name,
+               url,
+               perms,
+               `type`,
+               icon,
+               order_num,
+               gmt_create,
+               gmt_modified
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join
+             sys_user_role ur
+             on rm.role_id = ur.role_id
+        where ur.user_id = #{id}
+          and m.type in (0, 1)
+        order by m.order_num
+    </select>

-	<select id="listUserPerms" resultType="string">
-		select distinct m.perms
-		from sys_menu m left join
-		sys_role_menu rm on m.menu_id = rm.menu_id
-		left join sys_user_role ur
-		on rm.role_id = ur.role_id where ur.user_id
-		= #{id}
-	</select>
+    <select id="listUserPerms" resultType="string">
+        select m.perms
+        from sys_menu m
+                 left join
+             sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_user_role ur
+                           on rm.role_id = ur.role_id
+        where ur.user_id
+                  = #{id}
+    </select>
 </mapper>
--- a/novel-admin/src/main/resources/mybatis/system/UserMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/system/UserMapper.xml
@ -4,8 +4,28 @@
 <mapper namespace="com.java2nb.system.dao.SysUserDao">

    <select id="get" resultType="com.java2nb.system.domain.UserDO">
-		select `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district` from sys_user where user_id = #{value}
-	</select>
+        select `user_id`,
+               `username`,
+               `name`,
+               `password`,
+               `dept_id`,
+               `email`,
+               `mobile`,
+               `status`,
+               `user_id_create`,
+               `gmt_create`,
+               `gmt_modified`,
+               `sex`,
+               `birth`,
+               `pic_id`,
+               `live_address`,
+               `hobby`,
+               `province`,
+               `city`,
+               `district`
+        from sys_user
+        where user_id = #{value}
+    </select>

    <select id="list" resultType="com.java2nb.system.domain.UserDO">
        select
@ -51,7 +71,8 @@
    </select>

    <select id="listByPerm" resultType="com.java2nb.system.domain.UserDO">
-        select `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district`
+        select
+        `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district`
        from (
        select
        `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district`
@ -97,7 +118,8 @@
    </select>
    <select id="countByPerm" resultType="int">
        select count(*) from (
-        select `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district`
+        select
+        `user_id`,`username`,`name`,`password`,`dept_id`,`email`,`mobile`,`status`,`user_id_create`,`gmt_create`,`gmt_modified`,`sex`,`birth`,`pic_id`,`live_address`,`hobby`,`province`,`city`,`district`
        from sys_user
        <where>
            <if test="userId != null and userId != ''">and user_id = #{userId}</if>
@ -149,49 +171,44 @@
    </select>

    <insert id="save" parameterType="com.java2nb.system.domain.UserDO" useGeneratedKeys="true" keyProperty="userId">
-		insert into sys_user
-		(
-			`username`, 
-			`name`, 
-			`password`, 
-			`dept_id`, 
-			`email`, 
-			`mobile`, 
-			`status`, 
-			`user_id_create`, 
-			`gmt_create`, 
-			`gmt_modified`, 
-			`sex`, 
-			`birth`, 
-			`pic_id`, 
-			`live_address`, 
-			`hobby`, 
-			`province`, 
-			`city`, 
-			`district`
-		)
-		values
-		(
-			#{username}, 
-			#{name}, 
-			#{password}, 
-			#{deptId}, 
-			#{email}, 
-			#{mobile}, 
-			#{status}, 
-			#{userIdCreate}, 
-			#{gmtCreate}, 
-			#{gmtModified}, 
-			#{sex}, 
-			#{birth}, 
-			#{picId}, 
-			#{liveAddress}, 
-			#{hobby}, 
-			#{province}, 
-			#{city}, 
-			#{district}
-		)
-	</insert>
+        insert into sys_user
+        (`username`,
+         `name`,
+         `password`,
+         `dept_id`,
+         `email`,
+         `mobile`,
+         `status`,
+         `user_id_create`,
+         `gmt_create`,
+         `gmt_modified`,
+         `sex`,
+         `birth`,
+         `pic_id`,
+         `live_address`,
+         `hobby`,
+         `province`,
+         `city`,
+         `district`)
+        values (#{username},
+                #{name},
+                #{password},
+                #{deptId},
+                #{email},
+                #{mobile},
+                #{status},
+                #{userIdCreate},
+                #{gmtCreate},
+                #{gmtModified},
+                #{sex},
+                #{birth},
+                #{picId},
+                #{liveAddress},
+                #{hobby},
+                #{province},
+                #{city},
+                #{district})
+    </insert>

    <update id="update" parameterType="com.java2nb.system.domain.UserDO">
        update sys_user
@ -219,8 +236,10 @@
    </update>

    <delete id="remove">
-		delete from sys_user where user_id = #{value}
-	</delete>
+        delete
+        from sys_user
+        where user_id = #{value}
+    </delete>

    <delete id="batchRemove">
        delete from sys_user where user_id in
@ -230,7 +249,8 @@
    </delete>

    <select id="listAllDept" resultType="long">
-				select DISTINCT dept_id from sys_user
-	</select>
+        select dept_id
+        from sys_user
+    </select>

 </mapper>
--- a/novel-admin/src/main/resources/mybatis/test/OrderMapper.xml
+++ b/novel-admin/src/main/resources/mybatis/test/OrderMapper.xml
@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.java2nb.test.dao.OrderDao">
-
-	<select id="get" resultType="com.java2nb.test.domain.OrderDO">
-		select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order where id = #{value}
-	</select>
-
-	<select id="list" resultType="com.java2nb.test.domain.OrderDO">
-		select `id`,`fb_merchant_code`,`merchant_order_sn`,`order_sn`,`platform_order_no`,`trade_no`,`order_state`,`fn_coupon`,`red_packet`,`total_fee`,`order_price`,`fee`,`body`,`attach`,`store_id`,`cashier_id`,`device_no`,`user_id`,`user_logon_id`,`pay_time`,`pay_channel`,`no_cash_coupon_fee`,`cash_coupon_fee`,`cash_fee`,`sign`,`options`,`create_time`,`push_time`,`push_ip`,`mcht_id`,`sn` from fb_order
-        <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="fbMerchantCode != null and fbMerchantCode != ''"> and fb_merchant_code = #{fbMerchantCode} </if>
-		  		  <if test="merchantOrderSn != null and merchantOrderSn != ''"> and merchant_order_sn = #{merchantOrderSn} </if>
-		  		  <if test="orderSn != null and orderSn != ''"> and order_sn = #{orderSn} </if>
-		  		  <if test="platformOrderNo != null and platformOrderNo != ''"> and platform_order_no = #{platformOrderNo} </if>
-		  		  <if test="tradeNo != null and tradeNo != ''"> and trade_no = #{tradeNo} </if>
-		  		  <if test="orderState != null and orderState != ''"> and order_state = #{orderState} </if>
-		  		  <if test="fnCoupon != null and fnCoupon != ''"> and fn_coupon = #{fnCoupon} </if>
-		  		  <if test="redPacket != null and redPacket != ''"> and red_packet = #{redPacket} </if>
-		  		  <if test="totalFee != null and totalFee != ''"> and total_fee = #{totalFee} </if>
-		  		  <if test="orderPrice != null and orderPrice != ''"> and order_price = #{orderPrice} </if>
-		  		  <if test="fee != null and fee != ''"> and fee = #{fee} </if>
-		  		  <if test="body != null and body != ''"> and body = #{body} </if>
-		  		  <if test="attach != null and attach != ''"> and attach = #{attach} </if>
-		  		  <if test="storeId != null and storeId != ''"> and store_id = #{storeId} </if>
-		  		  <if test="cashierId != null and cashierId != ''"> and cashier_id = #{cashierId} </if>
-		  		  <if test="deviceNo != null and deviceNo != ''"> and device_no = #{deviceNo} </if>
-		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
-		  		  <if test="userLogonId != null and userLogonId != ''"> and user_logon_id = #{userLogonId} </if>
-		  		  <if test="payTime != null and payTime != ''"> and pay_time = #{payTime} </if>
-		  		  <if test="payChannel != null and payChannel != ''"> and pay_channel = #{payChannel} </if>
-		  		  <if test="noCashCouponFee != null and noCashCouponFee != ''"> and no_cash_coupon_fee = #{noCashCouponFee} </if>
-		  		  <if test="cashCouponFee != null and cashCouponFee != ''"> and cash_coupon_fee = #{cashCouponFee} </if>
-		  		  <if test="cashFee != null and cashFee != ''"> and cash_fee = #{cashFee} </if>
-		  		  <if test="sign != null and sign != ''"> and sign = #{sign} </if>
-		  		  <if test="options != null and options != ''"> and options = #{options} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="pushTime != null and pushTime != ''"> and push_time = #{pushTime} </if>
-		  		  <if test="pushIp != null and pushIp != ''"> and push_ip = #{pushIp} </if>
-		  		  <if test="mchtId != null and mchtId != ''"> and mcht_id = #{mchtId} </if>
-		  		  <if test="sn != null and sn != ''"> and sn = #{sn} </if>
-		  		</where>
-        <choose>
-            <when test="sort != null and sort.trim() != ''">
-                order by ${sort} ${order}
-            </when>
-			<otherwise>
-                order by id desc
-			</otherwise>
-        </choose>
-		<if test="offset != null and limit != null">
-			limit #{offset}, #{limit}
-		</if>
-	</select>
-	
- 	<select id="count" resultType="int">
-		select count(*) from fb_order
-		 <where>  
-		  		  <if test="id != null and id != ''"> and id = #{id} </if>
-		  		  <if test="fbMerchantCode != null and fbMerchantCode != ''"> and fb_merchant_code = #{fbMerchantCode} </if>
-		  		  <if test="merchantOrderSn != null and merchantOrderSn != ''"> and merchant_order_sn = #{merchantOrderSn} </if>
-		  		  <if test="orderSn != null and orderSn != ''"> and order_sn = #{orderSn} </if>
-		  		  <if test="platformOrderNo != null and platformOrderNo != ''"> and platform_order_no = #{platformOrderNo} </if>
-		  		  <if test="tradeNo != null and tradeNo != ''"> and trade_no = #{tradeNo} </if>
-		  		  <if test="orderState != null and orderState != ''"> and order_state = #{orderState} </if>
-		  		  <if test="fnCoupon != null and fnCoupon != ''"> and fn_coupon = #{fnCoupon} </if>
-		  		  <if test="redPacket != null and redPacket != ''"> and red_packet = #{redPacket} </if>
-		  		  <if test="totalFee != null and totalFee != ''"> and total_fee = #{totalFee} </if>
-		  		  <if test="orderPrice != null and orderPrice != ''"> and order_price = #{orderPrice} </if>
-		  		  <if test="fee != null and fee != ''"> and fee = #{fee} </if>
-		  		  <if test="body != null and body != ''"> and body = #{body} </if>
-		  		  <if test="attach != null and attach != ''"> and attach = #{attach} </if>
-		  		  <if test="storeId != null and storeId != ''"> and store_id = #{storeId} </if>
-		  		  <if test="cashierId != null and cashierId != ''"> and cashier_id = #{cashierId} </if>
-		  		  <if test="deviceNo != null and deviceNo != ''"> and device_no = #{deviceNo} </if>
-		  		  <if test="userId != null and userId != ''"> and user_id = #{userId} </if>
-		  		  <if test="userLogonId != null and userLogonId != ''"> and user_logon_id = #{userLogonId} </if>
-		  		  <if test="payTime != null and payTime != ''"> and pay_time = #{payTime} </if>
-		  		  <if test="payChannel != null and payChannel != ''"> and pay_channel = #{payChannel} </if>
-		  		  <if test="noCashCouponFee != null and noCashCouponFee != ''"> and no_cash_coupon_fee = #{noCashCouponFee} </if>
-		  		  <if test="cashCouponFee != null and cashCouponFee != ''"> and cash_coupon_fee = #{cashCouponFee} </if>
-		  		  <if test="cashFee != null and cashFee != ''"> and cash_fee = #{cashFee} </if>
-		  		  <if test="sign != null and sign != ''"> and sign = #{sign} </if>
-		  		  <if test="options != null and options != ''"> and options = #{options} </if>
-		  		  <if test="createTime != null and createTime != ''"> and create_time = #{createTime} </if>
-		  		  <if test="pushTime != null and pushTime != ''"> and push_time = #{pushTime} </if>
-		  		  <if test="pushIp != null and pushIp != ''"> and push_ip = #{pushIp} </if>
-		  		  <if test="mchtId != null and mchtId != ''"> and mcht_id = #{mchtId} </if>
-		  		  <if test="sn != null and sn != ''"> and sn = #{sn} </if>
-		  		</where>
-	</select>
-	 
-	<insert id="save" parameterType="com.java2nb.test.domain.OrderDO" useGeneratedKeys="true" keyProperty="id">
-		insert into fb_order
-		(
-			`fb_merchant_code`, 
-			`merchant_order_sn`, 
-			`order_sn`, 
-			`platform_order_no`, 
-			`trade_no`, 
-			`order_state`, 
-			`fn_coupon`, 
-			`red_packet`, 
-			`total_fee`, 
-			`order_price`, 
-			`fee`, 
-			`body`, 
-			`attach`, 
-			`store_id`, 
-			`cashier_id`, 
-			`device_no`, 
-			`user_id`, 
-			`user_logon_id`, 
-			`pay_time`, 
-			`pay_channel`, 
-			`no_cash_coupon_fee`, 
-			`cash_coupon_fee`, 
-			`cash_fee`, 
-			`sign`, 
-			`options`, 
-			`create_time`, 
-			`push_time`, 
-			`push_ip`, 
-			`mcht_id`, 
-			`sn`
-		)
-		values
-		(
-			#{fbMerchantCode}, 
-			#{merchantOrderSn}, 
-			#{orderSn}, 
-			#{platformOrderNo}, 
-			#{tradeNo}, 
-			#{orderState}, 
-			#{fnCoupon}, 
-			#{redPacket}, 
-			#{totalFee}, 
-			#{orderPrice}, 
-			#{fee}, 
-			#{body}, 
-			#{attach}, 
-			#{storeId}, 
-			#{cashierId}, 
-			#{deviceNo}, 
-			#{userId}, 
-			#{userLogonId}, 
-			#{payTime}, 
-			#{payChannel}, 
-			#{noCashCouponFee}, 
-			#{cashCouponFee}, 
-			#{cashFee}, 
-			#{sign}, 
-			#{options}, 
-			#{createTime}, 
-			#{pushTime}, 
-			#{pushIp}, 
-			#{mchtId}, 
-			#{sn}
-		)
-	</insert>
-
-	<insert id="saveSelective" parameterType="com.java2nb.test.domain.OrderDO" useGeneratedKeys="true" keyProperty="id">
-		insert into fb_order
-		(
-					<if test="id != null"> `id`,  </if>
-					<if test="fbMerchantCode != null"> `fb_merchant_code`,  </if>
-					<if test="merchantOrderSn != null"> `merchant_order_sn`,  </if>
-					<if test="orderSn != null"> `order_sn`,  </if>
-					<if test="platformOrderNo != null"> `platform_order_no`,  </if>
-					<if test="tradeNo != null"> `trade_no`,  </if>
-					<if test="orderState != null"> `order_state`,  </if>
-					<if test="fnCoupon != null"> `fn_coupon`,  </if>
-					<if test="redPacket != null"> `red_packet`,  </if>
-					<if test="totalFee != null"> `total_fee`,  </if>
-					<if test="orderPrice != null"> `order_price`,  </if>
-					<if test="fee != null"> `fee`,  </if>
-					<if test="body != null"> `body`,  </if>
-					<if test="attach != null"> `attach`,  </if>
-					<if test="storeId != null"> `store_id`,  </if>
-					<if test="cashierId != null"> `cashier_id`,  </if>
-					<if test="deviceNo != null"> `device_no`,  </if>
-					<if test="userId != null"> `user_id`,  </if>
-					<if test="userLogonId != null"> `user_logon_id`,  </if>
-					<if test="payTime != null"> `pay_time`,  </if>
-					<if test="payChannel != null"> `pay_channel`,  </if>
-					<if test="noCashCouponFee != null"> `no_cash_coupon_fee`,  </if>
-					<if test="cashCouponFee != null"> `cash_coupon_fee`,  </if>
-					<if test="cashFee != null"> `cash_fee`,  </if>
-					<if test="sign != null"> `sign`,  </if>
-					<if test="options != null"> `options`,  </if>
-					<if test="createTime != null"> `create_time`,  </if>
-					<if test="pushTime != null"> `push_time`,  </if>
-					<if test="pushIp != null"> `push_ip`,  </if>
-					<if test="mchtId != null"> `mcht_id`,  </if>
-					<if test="sn != null"> `sn` </if>
-				)
-		values
-		(
-					<if test="id != null"> #{id},  </if>
-					<if test="fbMerchantCode != null"> #{fbMerchantCode},  </if>
-					<if test="merchantOrderSn != null"> #{merchantOrderSn},  </if>
-					<if test="orderSn != null"> #{orderSn},  </if>
-					<if test="platformOrderNo != null"> #{platformOrderNo},  </if>
-					<if test="tradeNo != null"> #{tradeNo},  </if>
-					<if test="orderState != null"> #{orderState},  </if>
-					<if test="fnCoupon != null"> #{fnCoupon},  </if>
-					<if test="redPacket != null"> #{redPacket},  </if>
-					<if test="totalFee != null"> #{totalFee},  </if>
-					<if test="orderPrice != null"> #{orderPrice},  </if>
-					<if test="fee != null"> #{fee},  </if>
-					<if test="body != null"> #{body},  </if>
-					<if test="attach != null"> #{attach},  </if>
-					<if test="storeId != null"> #{storeId},  </if>
-					<if test="cashierId != null"> #{cashierId},  </if>
-					<if test="deviceNo != null"> #{deviceNo},  </if>
-					<if test="userId != null"> #{userId},  </if>
-					<if test="userLogonId != null"> #{userLogonId},  </if>
-					<if test="payTime != null"> #{payTime},  </if>
-					<if test="payChannel != null"> #{payChannel},  </if>
-					<if test="noCashCouponFee != null"> #{noCashCouponFee},  </if>
-					<if test="cashCouponFee != null"> #{cashCouponFee},  </if>
-					<if test="cashFee != null"> #{cashFee},  </if>
-					<if test="sign != null"> #{sign},  </if>
-					<if test="options != null"> #{options},  </if>
-					<if test="createTime != null"> #{createTime},  </if>
-					<if test="pushTime != null"> #{pushTime},  </if>
-					<if test="pushIp != null"> #{pushIp},  </if>
-					<if test="mchtId != null"> #{mchtId},  </if>
-					<if test="sn != null"> #{sn} </if>
-				)
-	</insert>
-	 
-	<update id="update" parameterType="com.java2nb.test.domain.OrderDO">
-		update fb_order 
-		<set>
-			<if test="fbMerchantCode != null">`fb_merchant_code` = #{fbMerchantCode}, </if>
-			<if test="merchantOrderSn != null">`merchant_order_sn` = #{merchantOrderSn}, </if>
-			<if test="orderSn != null">`order_sn` = #{orderSn}, </if>
-			<if test="platformOrderNo != null">`platform_order_no` = #{platformOrderNo}, </if>
-			<if test="tradeNo != null">`trade_no` = #{tradeNo}, </if>
-			<if test="orderState != null">`order_state` = #{orderState}, </if>
-			<if test="fnCoupon != null">`fn_coupon` = #{fnCoupon}, </if>
-			<if test="redPacket != null">`red_packet` = #{redPacket}, </if>
-			<if test="totalFee != null">`total_fee` = #{totalFee}, </if>
-			<if test="orderPrice != null">`order_price` = #{orderPrice}, </if>
-			<if test="fee != null">`fee` = #{fee}, </if>
-			<if test="body != null">`body` = #{body}, </if>
-			<if test="attach != null">`attach` = #{attach}, </if>
-			<if test="storeId != null">`store_id` = #{storeId}, </if>
-			<if test="cashierId != null">`cashier_id` = #{cashierId}, </if>
-			<if test="deviceNo != null">`device_no` = #{deviceNo}, </if>
-			<if test="userId != null">`user_id` = #{userId}, </if>
-			<if test="userLogonId != null">`user_logon_id` = #{userLogonId}, </if>
-			<if test="payTime != null">`pay_time` = #{payTime}, </if>
-			<if test="payChannel != null">`pay_channel` = #{payChannel}, </if>
-			<if test="noCashCouponFee != null">`no_cash_coupon_fee` = #{noCashCouponFee}, </if>
-			<if test="cashCouponFee != null">`cash_coupon_fee` = #{cashCouponFee}, </if>
-			<if test="cashFee != null">`cash_fee` = #{cashFee}, </if>
-			<if test="sign != null">`sign` = #{sign}, </if>
-			<if test="options != null">`options` = #{options}, </if>
-			<if test="createTime != null">`create_time` = #{createTime}, </if>
-			<if test="pushTime != null">`push_time` = #{pushTime}, </if>
-			<if test="pushIp != null">`push_ip` = #{pushIp}, </if>
-			<if test="mchtId != null">`mcht_id` = #{mchtId}, </if>
-			<if test="sn != null">`sn` = #{sn}</if>
-		</set>
-		where id = #{id}
-	</update>
-	
-	<delete id="remove">
-		delete from fb_order where id = #{value}
-	</delete>
-	
-	<delete id="batchRemove">
-		delete from fb_order where id in 
-		<foreach item="id" collection="array" open="(" separator="," close=")">
-			#{id}
-		</foreach>
-	</delete>
-
-</mapper>
--- a/novel-admin/src/main/resources/static/js/appjs/novel/book/book.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/book/book.js
@ -59,220 +59,103 @@ function load() {
                            return arguments[2] + 1;
                        }
                    },
-                                                                        {
-                                field: 'id',
-                                title: '主键'
-                            },

-                        
-                                                                        {
-                                field: 'workDirection',
-                                title: '作品方向，0：男频，1：女频'
-                            },
+                    {
+                        field: 'workDirection',
+                        title: '作品方向',
+                        formatter: function (value, row, index) {
+                            return value === 0 ? '男频' : '女频';
+                        }
+                    },

-                        
-                                                                        {
-                                field: 'catId',
-                                title: '分类ID'
-                            },
+                    {
+                        field: 'catName',
+                        title: '分类名'
+                    },

-                        
-                                                                        {
-                                field: 'catName',
-                                title: '分类名'
-                            },
+                    {
+                        field: 'bookName',
+                        title: '小说名'
+                    },

-                        
-                                                                        {
-                                field: 'catChildId',
-                                title: '子分类ID'
-                            },
+                    {
+                        field: 'authorName',
+                        title: '作者名'
+                    },

-                        
-                                                                        {
-                                field: 'catChildName',
-                                title: '子分类名'
-                            },
+                    {
+                        field: 'bookStatus',
+                        title: '书籍状态',
+                        formatter: function (value, row, index) {
+                            return value === 0 ? '连载中' : '已完结';
+                        }
+                    },

-                        
-                                                                        {
-                                field: 'picUrl',
-                                title: '小说封面'
-                            },
+                    {
+                        field: 'visitCount',
+                        title: '点击量'
+                    },

-                        
-                                                                        {
-                                field: 'bookName',
-                                title: '小说名'
-                            },
+                    {
+                        field: 'wordCount',
+                        title: '总字数'
+                    },

-                        
-                                                                        {
-                                field: 'heroName',
-                                title: '男主角姓名'
-                            },
+                    {
+                        field: 'commentCount',
+                        title: '评论数'
+                    },

-                        
-                                                                        {
-                                field: 'ladyName',
-                                title: '女主角姓名'
-                            },
+                    {
+                        field: 'yesterdayBuy',
+                        title: '昨日订阅数'
+                    },

-                        
-                                                                        {
-                                field: 'bookStyle',
-                                title: '作品风格，0：甜宠，1：虐恋，2：其他'
-                            },
+                    {
+                        field: 'lastIndexName',
+                        title: '最新章节'
+                    },

-                        
-                                                                        {
-                                field: 'bookLabel',
-                                title: '作品标签'
-                            },

-                        
-                                                                        {
-                                field: 'authorId',
-                                title: '作者id'
-                            },
+                    {
+                        field: 'lastIndexUpdateTime',
+                        title: '最新章节更新时间'
+                    },

-                        
-                                                                        {
-                                field: 'authorName',
-                                title: '作者名'
-                            },

-                        
-                                                                        {
-                                field: 'bookDesc',
-                                title: '书籍描述'
-                            },
+                    {
+                        field: 'isVip',
+                        title: '是否收费',
+                        formatter: function (value, row, index) {
+                            return value === 1 ? '收费' : '免费';
+                        }
+                    },

-                        
-                                                                        {
-                                field: 'score',
-                                title: '评分，预留字段'
-                            },
+                    {
+                        field: 'createTime',
+                        title: '入库时间'
+                    },

-                        
-                                                                        {
-                                field: 'bookStatus',
-                                title: '书籍状态，0：连载中，1：已完结'
-                            },
-
-                        
-                                                                        {
-                                field: 'visitCount',
-                                title: '点击量'
-                            },
-
-                        
-                                                                        {
-                                field: 'wordCount',
-                                title: '总字数'
-                            },
-
-                        
-                                                                        {
-                                field: 'commentCount',
-                                title: '评论数'
-                            },
-
-                        
-                                                                        {
-                                field: 'yesterdayBuy',
-                                title: '昨日订阅数'
-                            },
-
-                        
-                                                                        {
-                                field: 'lastIndexId',
-                                title: '最新目录ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'lastIndexName',
-                                title: '最新目录名'
-                            },
-
-                        
-                                                                        {
-                                field: 'lastIndexUpdateTime',
-                                title: '最新目录更新时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'isVip',
-                                title: '是否收费，1：收费，0：免费'
-                            },
-
-                        
-                                                                        {
-                                field: 'status',
-                                title: '状态，0：入库，1：上架'
-                            },
-
-                        
-                                                                        {
-                                field: 'updateTime',
-                                title: '更新时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'createTime',
-                                title: '创建时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlSourceId',
-                                title: '爬虫源站ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlBookId',
-                                title: '抓取的源站小说ID'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlLastTime',
-                                title: '最后一次的抓取时间'
-                            },
-
-                        
-                                                                        {
-                                field: 'crawlIsStop',
-                                title: '是否已停止更新，0：未停止，1：已停止'
-                            },
-
-                        
-                                        {
+                    {
                        title: '操作',
                        field: 'id',
                        align: 'center',
                        formatter: function (value, row, index) {
-                            var d = '<a class="btn btn-primary btn-sm ' + s_detail_h + '" href="#" mce_href="#" title="详情" onclick="detail(\''
-                                + row.id
-                                + '\')"><i class="fa fa-file"></i></a> ';
-                            var e = '<a class="btn btn-primary btn-sm ' + s_edit_h + '" href="#" mce_href="#" title="编辑" onclick="edit(\''
-                                + row.id
-                                + '\')"><i class="fa fa-edit"></i></a> ';
                            var r = '<a class="btn btn-warning btn-sm ' + s_remove_h + '" href="#" title="删除"  mce_href="#" onclick="remove(\''
                                + row.id
                                + '\')"><i class="fa fa-remove"></i></a> ';
-                            return d + e + r;
+                            return r;
                        }
-                    }]
+                    }
+
+                ]
            });
 }
+
 function reLoad() {
    $('#exampleTable').bootstrapTable('refresh');
 }
+
 function add() {
    layer.open({
        type: 2,
@ -283,6 +166,7 @@ function add() {
        content: prefix + '/add' // iframe的url
    });
 }
+
 function detail(id) {
    layer.open({
        type: 2,
@ -293,6 +177,7 @@ function detail(id) {
        content: prefix + '/detail/' + id // iframe的url
    });
 }
+
 function edit(id) {
    layer.open({
        type: 2,
@ -303,6 +188,7 @@ function edit(id) {
        content: prefix + '/edit/' + id // iframe的url
    });
 }
+
 function remove(id) {
    layer.confirm('确定要删除选中的记录？', {
        btn: ['确定', '取消']
@ -327,6 +213,7 @@ function remove(id) {

 function resetPwd(id) {
 }
+
 function batchRemove() {
    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
    if (rows.length == 0) {
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookComment/add.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookComment/add.js
@ -0,0 +1,107 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+
+
+
+
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        save();
+    }
+});
+function save() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookComment/save",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+        $("#signupForm").validate({
+            ignore: "",
+            rules: {
+                                                                                            },
+    messages: {
+                                                                                                                                                        }
+})
+}
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookComment/bookComment.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookComment/bookComment.js
@ -0,0 +1,201 @@
+var prefix = "/novel/bookComment"
+$(function () {
+    load();
+});
+
+function load() {
+    $('#exampleTable')
+        .bootstrapTable(
+            {
+                method: 'get', // 服务器数据的请求方式 get or post
+                url: prefix + "/list", // 服务器数据的加载地址
+                //	showRefresh : true,
+                //	showToggle : true,
+                //	showColumns : true,
+                iconSize: 'outline',
+                toolbar: '#exampleToolbar',
+                striped: true, // 设置为true会有隔行变色效果
+                dataType: "json", // 服务器返回的数据类型
+                pagination: true, // 设置为true会在底部显示分页条
+                // queryParamsType : "limit",
+                // //设置为limit则会发送符合RESTFull格式的参数
+                singleSelect: false, // 设置为true将禁止多选
+                // contentType : "application/x-www-form-urlencoded",
+                // //发送到服务器的数据编码类型
+                pageSize: 10, // 如果设置了分页，每页数据条数
+                pageNumber: 1, // 如果设置了分布，首页页码
+                //search : true, // 是否显示搜索框
+                showColumns: false, // 是否显示内容下拉框（选择显示的列）
+                sidePagination: "server", // 设置在哪里进行分页，可选值为"client" 或者 "server"
+                queryParams: function (params) {
+                    //说明：传入后台的参数包括offset开始索引，limit步长，sort排序列，order：desc或者,以及所有列的键值对
+                    var queryParams = getFormJson("searchForm");
+                    queryParams.limit = params.limit;
+                    queryParams.offset = params.offset;
+                    return queryParams;
+                },
+                // //请求服务器数据时，你可以通过重写参数的方式添加一些额外的参数，例如 toolbar 中的参数 如果
+                // queryParamsType = 'limit' ,返回参数必须包含
+                // limit, offset, search, sort, order 否则, 需要包含:
+                // pageSize, pageNumber, searchText, sortName,
+                // sortOrder.
+                // 返回false将会终止请求
+                responseHandler: function (rs) {
+
+                    if (rs.code == 0) {
+                        return rs.data;
+                    } else {
+                        parent.layer.alert(rs.msg)
+                        return {total: 0, rows: []};
+                    }
+                },
+                columns: [
+                    {
+                        checkbox: true
+                    },
+                    {
+                        title: '序号',
+                        formatter: function () {
+                            return arguments[2] + 1;
+                        }
+                    },
+
+                    {
+                        field: 'bookName',
+                        title: '评论小说'
+                    },
+
+                    {
+                        field: 'commentContent',
+                        title: '评论内容'
+                    },
+
+
+                    {
+                        field: 'createTime',
+                        title: '评论时间'
+                    },
+
+
+                    {
+                        field: 'userName',
+                        title: '评论人'
+                    },
+
+
+                    {
+                        title: '操作',
+                        field: 'id',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var d = '<a class="btn btn-primary btn-sm ' + s_detail_h + '" href="#" mce_href="#" title="详情" onclick="detail(\''
+                                + row.id
+                                + '\')"><i class="fa fa-file"></i></a> ';
+                            var e = '<a class="btn btn-primary btn-sm ' + s_edit_h + '" href="#" mce_href="#" title="编辑" onclick="edit(\''
+                                + row.id
+                                + '\')"><i class="fa fa-edit"></i></a> ';
+                            var r = '<a class="btn btn-warning btn-sm ' + s_remove_h + '" href="#" title="删除"  mce_href="#" onclick="remove(\''
+                                + row.id
+                                + '\')"><i class="fa fa-remove"></i></a> ';
+                            return d + e + r;
+                        }
+                    }]
+            });
+}
+
+function reLoad() {
+    $('#exampleTable').bootstrapTable('refresh');
+}
+
+function add() {
+    layer.open({
+        type: 2,
+        title: '增加',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/add' // iframe的url
+    });
+}
+
+function detail(id) {
+    layer.open({
+        type: 2,
+        title: '详情',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/detail/' + id // iframe的url
+    });
+}
+
+function edit(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/edit/' + id // iframe的url
+    });
+}
+
+function remove(id) {
+    layer.confirm('确定要删除选中的记录？', {
+        btn: ['确定', '取消']
+    }, function () {
+        $.ajax({
+            url: prefix + "/remove",
+            type: "post",
+            data: {
+                'id': id
+            },
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    })
+}
+
+function resetPwd(id) {
+}
+
+function batchRemove() {
+    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
+    if (rows.length == 0) {
+        layer.msg("请选择要删除的数据");
+        return;
+    }
+    layer.confirm("确认要删除选中的'" + rows.length + "'条数据吗?", {
+        btn: ['确定', '取消']
+        // 按钮
+    }, function () {
+        var ids = new Array();
+        // 遍历所有选择的行数据，取每条数据对应的ID
+        $.each(rows, function (i, row) {
+            ids[i] = row['id'];
+        });
+        $.ajax({
+            type: 'POST',
+            data: {
+                "ids": ids
+            },
+            url: prefix + '/batchRemove',
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    }, function () {
+
+    });
+}
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookComment/edit.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookComment/edit.js
@ -0,0 +1,103 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+    editor.txt.html($("#" + relName).val());
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        update();
+    }
+});
+function update() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookComment/update",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+    $("#signupForm").validate({
+        ignore: "",
+        rules: {
+                                                                                        },
+    messages: {
+                                                                                                                                                        }
+})
+}
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookContent/add.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookContent/add.js
@ -0,0 +1,107 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+
+
+
+
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        save();
+    }
+});
+function save() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookContent/save",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+        $("#signupForm").validate({
+            ignore: "",
+            rules: {
+                                            },
+    messages: {
+                                                                        }
+})
+}
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookContent/bookContent.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookContent/bookContent.js
@ -0,0 +1,189 @@
+var prefix = "/novel/bookContent"
+$(function () {
+    load();
+});
+
+function load() {
+    $('#exampleTable')
+        .bootstrapTable(
+            {
+                method: 'get', // 服务器数据的请求方式 get or post
+                url: prefix + "/list", // 服务器数据的加载地址
+                //	showRefresh : true,
+                //	showToggle : true,
+                //	showColumns : true,
+                iconSize: 'outline',
+                toolbar: '#exampleToolbar',
+                striped: true, // 设置为true会有隔行变色效果
+                dataType: "json", // 服务器返回的数据类型
+                pagination: true, // 设置为true会在底部显示分页条
+                // queryParamsType : "limit",
+                // //设置为limit则会发送符合RESTFull格式的参数
+                singleSelect: false, // 设置为true将禁止多选
+                // contentType : "application/x-www-form-urlencoded",
+                // //发送到服务器的数据编码类型
+                pageSize: 10, // 如果设置了分页，每页数据条数
+                pageNumber: 1, // 如果设置了分布，首页页码
+                //search : true, // 是否显示搜索框
+                showColumns: false, // 是否显示内容下拉框（选择显示的列）
+                sidePagination: "server", // 设置在哪里进行分页，可选值为"client" 或者 "server"
+                queryParams: function (params) {
+                    //说明：传入后台的参数包括offset开始索引，limit步长，sort排序列，order：desc或者,以及所有列的键值对
+                    var queryParams = getFormJson("searchForm");
+                    queryParams.limit = params.limit;
+                    queryParams.offset = params.offset;
+                    return queryParams;
+                },
+                // //请求服务器数据时，你可以通过重写参数的方式添加一些额外的参数，例如 toolbar 中的参数 如果
+                // queryParamsType = 'limit' ,返回参数必须包含
+                // limit, offset, search, sort, order 否则, 需要包含:
+                // pageSize, pageNumber, searchText, sortName,
+                // sortOrder.
+                // 返回false将会终止请求
+                responseHandler: function (rs) {
+
+                    if (rs.code == 0) {
+                        return rs.data;
+                    } else {
+                        parent.layer.alert(rs.msg)
+                        return {total: 0, rows: []};
+                    }
+                },
+                columns: [
+                    {
+                        checkbox: true
+                    },
+                    {
+                        title: '序号',
+                        formatter: function () {
+                            return arguments[2] + 1;
+                        }
+                    },
+                                                                        {
+                                field: 'id',
+                                title: '主键'
+                            },
+
+                        
+                                                                        {
+                                field: 'indexId',
+                                title: '目录ID'
+                            },
+
+                        
+                                                                        {
+                                field: 'content',
+                                title: '小说章节内容'
+                            },
+
+                        
+                                        {
+                        title: '操作',
+                        field: 'id',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var d = '<a class="btn btn-primary btn-sm ' + s_detail_h + '" href="#" mce_href="#" title="详情" onclick="detail(\''
+                                + row.id
+                                + '\')"><i class="fa fa-file"></i></a> ';
+                            var e = '<a class="btn btn-primary btn-sm ' + s_edit_h + '" href="#" mce_href="#" title="编辑" onclick="edit(\''
+                                + row.id
+                                + '\')"><i class="fa fa-edit"></i></a> ';
+                            var r = '<a class="btn btn-warning btn-sm ' + s_remove_h + '" href="#" title="删除"  mce_href="#" onclick="remove(\''
+                                + row.id
+                                + '\')"><i class="fa fa-remove"></i></a> ';
+                            return d + e + r;
+                        }
+                    }]
+            });
+}
+function reLoad() {
+    $('#exampleTable').bootstrapTable('refresh');
+}
+function add() {
+    layer.open({
+        type: 2,
+        title: '增加',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/add' // iframe的url
+    });
+}
+function detail(id) {
+    layer.open({
+        type: 2,
+        title: '详情',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/detail/' + id // iframe的url
+    });
+}
+function edit(id) {
+    layer.open({
+        type: 2,
+        title: '编辑',
+        maxmin: true,
+        shadeClose: false, // 点击遮罩关闭层
+        area: ['800px', '520px'],
+        content: prefix + '/edit/' + id // iframe的url
+    });
+}
+function remove(id) {
+    layer.confirm('确定要删除选中的记录？', {
+        btn: ['确定', '取消']
+    }, function () {
+        $.ajax({
+            url: prefix + "/remove",
+            type: "post",
+            data: {
+                'id': id
+            },
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    })
+}
+
+function resetPwd(id) {
+}
+function batchRemove() {
+    var rows = $('#exampleTable').bootstrapTable('getSelections'); // 返回所有选择的行，当没有选择的记录时，返回一个空数组
+    if (rows.length == 0) {
+        layer.msg("请选择要删除的数据");
+        return;
+    }
+    layer.confirm("确认要删除选中的'" + rows.length + "'条数据吗?", {
+        btn: ['确定', '取消']
+        // 按钮
+    }, function () {
+        var ids = new Array();
+        // 遍历所有选择的行数据，取每条数据对应的ID
+        $.each(rows, function (i, row) {
+            ids[i] = row['id'];
+        });
+        $.ajax({
+            type: 'POST',
+            data: {
+                "ids": ids
+            },
+            url: prefix + '/batchRemove',
+            success: function (r) {
+                if (r.code == 0) {
+                    layer.msg(r.msg);
+                    reLoad();
+                } else {
+                    layer.msg(r.msg);
+                }
+            }
+        });
+    }, function () {
+
+    });
+}
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookContent/edit.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookContent/edit.js
@ -0,0 +1,103 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+    editor.txt.html($("#" + relName).val());
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        update();
+    }
+});
+function update() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookContent/update",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+    $("#signupForm").validate({
+        ignore: "",
+        rules: {
+                                        },
+    messages: {
+                                                                        }
+})
+}
--- a/novel-admin/src/main/resources/static/js/appjs/novel/bookIndex/add.js
+++ b/novel-admin/src/main/resources/static/js/appjs/novel/bookIndex/add.js
@ -0,0 +1,107 @@
+var E = window.wangEditor;
+$("[id^='contentEditor']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(13);
+    var editor = new E('#contentEditor' + relName);
+// 自定义菜单配置
+    editor.customConfig.menus = [
+        'head',  // 标题
+        'bold',  // 粗体
+        'fontSize',  // 字号
+        'fontName',  // 字体
+        'italic',  // 斜体
+        'underline',  // 下划线
+        'strikeThrough',  // 删除线
+        'foreColor',  // 文字颜色
+        //'backColor',  // 背景颜色
+        //'link',  // 插入链接
+        'list',  // 列表
+        'justify',  // 对齐方式
+        'quote',  // 引用
+        'emoticon',  // 表情
+        'image',  // 插入图片
+        //'table',  // 表格
+        //'video',  // 插入视频
+        //'code',  // 插入代码
+        'undo',  // 撤销
+        'redo'  // 重复
+    ];
+    editor.customConfig.onchange = function (html) {
+        // html 即变化之后的内容
+        $("#" + relName).val(html);
+    }
+    editor.customConfig.uploadImgShowBase64 = true;
+    editor.create();
+
+})
+
+$("[id^='picImage']").each(function (index, ele) {
+    var relName = $(ele).attr("id").substring(8);
+    layui.use('upload', function () {
+        var upload = layui.upload;
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#picImage' + relName, //绑定元素
+            url: '/common/sysFile/upload', //上传接口
+            size: 1000,
+            accept: 'file',
+            done: function (r) {
+                $("#picImage" + relName).attr("src", r.fileName);
+                $("#" + relName).val(r.fileName);
+            },
+            error: function (r) {
+                layer.msg(r.msg);
+            }
+        });
+    });
+
+});
+
+
+
+
+
+
+$().ready(function () {
+    validateRule();
+});
+
+$.validator.setDefaults({
+    submitHandler: function () {
+        save();
+    }
+});
+function save() {
+    $.ajax({
+        cache: true,
+        type: "POST",
+        url: "/novel/bookIndex/save",
+        data: $('#signupForm').serialize(),// 你的formid
+        async: false,
+        error: function (request) {
+            parent.layer.alert("Connection error");
+        },
+        success: function (data) {
+            if (data.code == 0) {
+                parent.layer.msg("操作成功");
+                parent.reLoad();
+                var index = parent.layer.getFrameIndex(window.name); // 获取窗口索引
+                parent.layer.close(index);
+
+            } else {
+                parent.layer.alert(data.msg)
+            }
+
+        }
+    });
+
+}
+function validateRule() {
+    var icon = "<i class='fa fa-times-circle'></i> ";
+        $("#signupForm").validate({
+            ignore: "",
+            rules: {
+                                                                                                                                },
+    messages: {
+                                                                                                                                                                                                                    }
+})
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xiongxiaoyang	6fb1e5cc99	chore: 模版更新	2023-04-15 08:37:17 +08:00
xiongxiaoyang	749fd1aeaa	docs: 项目演示	2023-04-15 08:08:57 +08:00
xiongxiaoyang	8c3fb7f1ca	build: 4.0.0 发布	2023-04-15 06:50:55 +08:00
xiongxiaoyang	c71eadef82	perf: 后台订单管理	2023-04-14 23:22:23 +08:00
xiongxiaoyang	3ffa75dc10	perf: 后台评论管理	2023-04-14 23:16:55 +08:00
xiongxiaoyang	8ddc6cc434	feat: 后台评论管理	2023-04-14 22:34:36 +08:00
xiongxiaoyang	5854536c70	fix: 代码生成数据表查询	2023-04-14 22:06:39 +08:00
xiongxiaoyang	a7d825cc54	fix: 后台模块查询过滤相同的行	2023-04-14 21:33:31 +08:00
xiongxiaoyang	687eb61846	feat: 后台小说删除	2023-04-14 21:09:37 +08:00
xiongxiaoyang	9f23f817b1	feat: 后台小说管理	2023-04-14 18:07:05 +08:00
xiongxiaoyang	0c59adf23b	feat: 后台订单管理	2023-04-14 17:29:41 +08:00
xiongxiaoyang	57eca58b24	feat: 后台会员管理	2023-04-14 16:58:04 +08:00
xiongxiaoyang	c76df15a7f	feat: 后台友情链接管理	2023-04-14 16:32:05 +08:00
xiongxiaoyang	3b0edd8e1f	fix: sql	2023-04-14 14:58:38 +08:00
xiongxiaoyang	2c3b735d49	feat: 后台网站信息管理	2023-04-14 14:56:11 +08:00
xiongxiaoyang	b45b83fdb0	Update README.md	2023-04-14 10:51:42 +08:00
xiongxiaoyang	29d074ec18	refactor: 移除 Ehcache，默认缓存设置为 Redis	2023-04-14 10:40:54 +08:00
xiongxiaoyang	282bc7b707	refactor: 移除 RabbitMQ 和 Elasticsearch 相关功能	2023-04-14 10:10:09 +08:00
xiongxiaoyang	68b3458c30	Add favicon.ico	2023-01-11 19:19:05 +08:00
xiongxiaoyang	2f5002f673	Update README.md	2022-08-29 08:12:32 +08:00
xiongxiaoyang	d293d7bf91	Merge branch 'develop_xxy' of https://gitee.com/novel_dev_team/novel-plus into develop_xxy	2022-07-31 08:12:41 +08:00
xiongxiaoyang	a9080310a4	update template & sql	2022-07-31 08:04:43 +08:00
xxy	1f571f9b64	Update README.md	2022-07-26 17:22:25 +08:00
xxy	7be529fe4a	Update README.md	2022-07-26 17:11:15 +08:00
xxy	2f62641b63	Update README.md	2022-07-24 14:53:27 +08:00
xxy	d962620814	Update README.md	2022-07-24 14:51:09 +08:00
xxy	7640d153ac	Update README.md	2022-07-21 21:28:26 +08:00
xxy	3d9f52ffee	Update README.md	2022-07-20 06:28:17 +08:00
xxy	0112af202b	Update README.md	2022-07-20 06:24:29 +08:00
xxy	e3010ea81e	Update README.md	2022-07-20 06:21:54 +08:00
xxy	05608d0316	Update README.md	2022-07-20 06:18:52 +08:00
xxy	4f6ec5aa0f	Update README.md	2022-07-20 06:17:48 +08:00
xxy	01984f7137	Update README.md	2022-07-18 18:20:06 +08:00
xxy	617f6f50b0	Update README.md	2022-07-18 13:14:27 +08:00
xxy	e0686f079c	Update README.md	2022-07-16 07:08:50 +08:00
xxy	5fb1717770	Update README.md	2022-07-15 22:49:11 +08:00
xxy	4bf495b6c0	Update README.md	2022-07-15 22:47:40 +08:00
xiongxiaoyang	028c200764	fix: 新笔趣阁规则移动到全量sql文件	2022-07-15 22:36:48 +08:00
xxy	472440ef7c	Update README.md	2022-07-15 19:26:12 +08:00
xxy	5278b5fc39	Update README.md	2022-07-15 19:24:04 +08:00
xxy	9a0a79957b	Update README.md	2022-07-15 19:19:49 +08:00
xxy	d93bf3dd4e	Update README.md	2022-07-15 19:15:42 +08:00
xxy	09a4f39172	Update README.md	2022-07-15 19:15:11 +08:00
xxy	3abe7e22c9	Update README.md	2022-07-15 19:14:05 +08:00
xxy	5e1135268a	Update README.md	2022-07-15 19:12:58 +08:00
xxy	54aeef7c80	Update README.md	2022-07-15 07:18:04 +08:00
xxy	027fbffb7f	Update README.md	2022-07-15 06:20:04 +08:00
xxy	5d70e44021	Update README.md	2022-07-15 00:49:35 +08:00
xiongxiaoyang	607deaa82f	build: v3.6.2 发布	2022-07-15 00:44:10 +08:00
xiongxiaoyang	b997367f1a	Merge github.com:201206030/novel-plus into develop_xxy	2022-07-15 00:32:30 +08:00
xiongxiaoyang	3d3cbc22b6	feat: 增加 HTTP 代理配置，助力爬虫采集	2022-07-14 23:41:47 +08:00
xiongxiaoyang	ba272bd89a	feat: 增加 HTTP 代理配置，助力爬虫采集	2022-07-14 22:14:11 +08:00
xxy	7d1b024c4d	Update README.md	2022-07-14 17:48:10 +08:00
xxy	e732c0fdee	Update README.md	2022-07-14 17:47:29 +08:00
xxy	78de1de846	Update README.md	2022-07-14 17:45:36 +08:00
xiongxiaoyang	0b728b9fe5	docs: 修改 sql 文件说明	2022-07-14 14:19:05 +08:00
xiongxiaoyang	ec3428c358	docs: 增加 sql 说明	2022-07-14 14:09:43 +08:00
xxy	3c322a9d0e	Update README.md	2022-07-14 13:44:54 +08:00
xxy	cdceb3818d	Update README.md	2022-07-14 13:40:23 +08:00
xiongxiaoyang	6fc2df9b5a	docs: 更新源码安装教程	2022-07-14 11:34:25 +08:00
xiongxiaoyang	c45b81fbbf	build: 优化打包	2022-07-14 09:49:36 +08:00
xiongxiaoyang	40a999f353	perf: 模版更新	2022-07-14 09:48:22 +08:00
xiongxiaoyang	547bf00f46	docs: update README.md	2022-05-22 21:43:47 +08:00
xxy	d6849bc5a2	update README.md.	2022-05-17 23:00:29 +00:00
xxy	dc654086f3	update README.md.	2022-05-17 03:22:26 +00:00
xxy	303cc2051f	update README.md	2022-05-17 03:19:22 +00:00
xiongxiaoyang	fe90345f0b	fix: 首页小说推荐数据渲染顶部推荐栏重复渲染同一本小说	2022-05-01 10:29:09 +08:00
xiongxiaoyang	7ac4b62840	update	2022-04-27 19:48:47 +08:00
xiongxiaoyang	029cce959b	update	2022-04-27 19:41:23 +08:00
xiongxiaoyang	7395cf63e5	add: 启动日志	2022-04-26 09:15:24 +08:00
xiongxiaoyang	906e7762c9	Merge github.com:201206030/novel-plus into develop_xxy	2022-01-17 21:03:39 +08:00
xiongxiaoyang	465e03a17b	perf: 缓存预编译的Pattern对象	2022-01-17 20:58:57 +08:00
xiaoyang	2a69a28a0c	perf: 预加载IdWorker	2022-01-08 11:59:28 +08:00
xiaoyang	c1eb7b8954	docs: 增加说明	2022-01-07 18:02:46 +08:00
xiaoyang	16e381f384	chore(sh): 修改JVM启动参数兼容低配置机器	2022-01-07 17:24:20 +08:00
xiaoyang	094ac95428	build(pom): 打包时复制common模块配置文件到外部	2021-12-28 14:40:16 +08:00
xiaoyang	96662fcb17	feat(crawl): 新增编辑规则和测试规则合并mstaer分支的pull request #71	2021-12-24 17:38:23 +08:00
xiaoyang	fecf03b3f5	fix: 升级mybatis版本，增加Optional支持	2021-12-24 11:35:59 +08:00
xiaoyang	e7f702ece0	docs: 微信群说明	2021-12-23 10:27:05 +08:00
xiaoyang	b2c67c4f15	build: 修改打包配置	2021-12-17 19:53:21 +08:00
201206030	6a385877ac	Merge pull request #69 from a100488/feature/saw_fenbao feat(打包改为分包): 打包改为分包	2021-12-17 16:45:13 +08:00
songanwei	7cde6ebf61	feat(打包改为分包): 打包改为分包	2021-12-17 16:33:45 +08:00
xiaoyang	78969f9fd1	fix: 修复单本小说采集即使没有采集到内容仍然标记状态为采集成功的问题	2021-12-17 10:20:59 +08:00
xiongxiaoyang	b2eb6686e9	build: 更新xxyopen依赖版本	2021-12-12 20:44:09 +08:00
xiongxiaoyang	c537f6fb20	docs: maven仓库配置说明	2021-12-11 20:56:11 +08:00
xiaoyang	16e4c98a45	refactor: 引入xxy-common相关依赖	2021-12-11 18:30:22 +08:00
xiaoyang	776083076c	update	2021-11-11 14:28:05 +08:00
xiaoyang	2bf945fe0e	样式调整	2021-11-08 19:55:03 +08:00
xiongxiaoyang	ede7aca66d	作家作品列表分页修复	2021-09-27 22:35:48 +08:00
xiongxiaoyang	396452b46e	3.6.1发布	2021-09-13 22:24:08 +08:00
xiongxiaoyang	fc2ea40c6a	实现小说内容多种存储方式（txt、db..）并存	2021-09-13 22:21:50 +08:00
xiongxiaoyang	bfe4d938fd	去除重复依赖	2021-09-11 22:07:14 +08:00
xiaoyang	7f4728191a	修改配置项命名	2021-09-04 16:27:02 +08:00
xiongxiaoyang	80b393fdda	v3.6.0发布	2021-08-17 21:14:15 +08:00
xiaoyang	e7897c988a	更新文档	2021-08-17 20:00:53 +08:00
xiaoyang	750c8dee02	增加小说内容TXT文本存储方案（一行配置切换）	2021-08-17 19:55:24 +08:00
xiaoyang	cbfd0b049f	爬虫部分代码重构，准备适配TXT文本存储方案	2021-08-17 11:08:51 +08:00
xiaoyang	7f0331e095	解决爬虫运行时的UnrecognizedPropertyException	2021-08-16 15:58:32 +08:00
xiaoyang	3520200a87	部分代码重构	2021-08-16 15:42:56 +08:00
xiaoyang	4939bcf418	模版更新	2021-08-09 19:46:32 +08:00
xiaoyang	1cffbae495	增加新闻阅读数	2021-07-26 19:06:57 +08:00
xiaoyang	b99b6ae4f2	新闻详情时间显示	2021-07-24 17:52:25 +08:00
201206030	2e2a58c84b	Merge pull request #41 from 201206030/dependabot/maven/novel-admin/org.apache.shiro-shiro-spring-1.7.0 Bump shiro-spring from 1.3.2 to 1.7.0 in /novel-admin	2021-07-24 16:54:19 +08:00
xiaoyang	4fe36a8f4f	部分爬虫代码优化	2021-07-24 15:51:54 +08:00
xiongxiaoyang	b5df86d5c7	perf(index.html): orange模版更新	2021-07-03 12:00:17 +08:00
xiongxiaoyang	9b3ba1d8c1	perf(index): 首页优化	2021-07-03 11:51:47 +08:00
xiaoyang	c4db754d23	docs(readme): 更新官网地址	2021-06-10 09:42:07 +08:00
xiongxiaoyang	8d3ce53dba	build(pom): v3.5.4发布	2021-06-01 23:14:35 +08:00
xiongxiaoyang	d32d9d8410	perf(html): 模版更新	2021-06-01 23:13:18 +08:00
xiongxiaoyang	05ae012e05	fix(yml): Public Key Retrieval is not allowed	2021-06-01 23:03:15 +08:00
xiongxiaoyang	b60a0c9b40	perf(监控): 设置druid监控信息登陆后查看	2021-06-01 22:49:23 +08:00
xiongxiaoyang	3efaf8ce5f	perf(评论): 优化评论显示	2021-06-01 22:01:05 +08:00
xiongxiaoyang	ebc4210774	fix(章节更新): xss	2021-06-01 21:44:18 +08:00
xiaoyang	655ec90906	fix(data submit): Xss攻击	2021-06-01 20:58:06 +08:00
xiaoyang	f28dd867ef	v3.5.3发布	2021-05-28 20:32:08 +08:00
xiaoyang	8e6842a495	模版更新	2021-05-28 20:08:45 +08:00
xiaoyang	928cb2417f	小说详情页优化	2021-05-28 20:04:52 +08:00
xiaoyang	625694ba1e	Merge branch 'release_3.5.3' into develop_xxy	2021-05-28 11:54:24 +08:00
xiaoyang	d6c0337c09	首页SEO优化	2021-05-28 11:51:11 +08:00
xiongxiaoyang	689efc0807	style(novel-common/bean): ResultBean更新代码格式化，去除多余分号	2021-05-16 10:54:25 +08:00
xiongxiaoyang	4540c3781e	模版更新	2021-05-16 09:49:35 +08:00
xiongxiaoyang	9d2c453bb0	图片上传流程优化	2021-05-16 09:47:23 +08:00
xxy	9de47ce697	update README.md.	2021-04-25 07:39:56 +08:00
xiongxiaoyang	c79974ff77	3.5.2发布	2021-04-24 10:46:59 +08:00
xiongxiaoyang	fb0098aef8	作家后台新增作品封片图片修改功能	2021-04-24 10:38:55 +08:00
dependabot[bot]	e83494cb17	Bump shiro-spring from 1.3.2 to 1.7.0 in /novel-admin Bumps shiro-spring from 1.3.2 to 1.7.0. Signed-off-by: dependabot[bot] <support@github.com>	2021-04-22 17:07:42 +00:00
xiongxiaoyang	419d7a971b	优化首页显示（修改周推小说数量）	2021-02-11 18:03:27 +08:00
xiongxiaoyang	83eda2a44d	模版更新	2021-02-11 12:25:04 +08:00
xiongxiaoyang	3182029bdd	文件压缩	2021-02-11 10:26:48 +08:00
xiongxiaoyang	19d4a9960d	使用图片懒加载优化首页加载速度	2021-02-11 09:36:03 +08:00
xiongxiaoyang	2603150b33	作家专区的跳转方式改为新标签页跳转	2021-02-11 08:31:27 +08:00
xiongxiaoyang	f5e440390b	修改404页面自动跳转首页的时间	2021-02-11 08:27:11 +08:00
xiongxiaoyang	91e525ec8e	v3.5.1发布	2021-02-05 00:39:25 +08:00
xiongxiaoyang	83afb9e6e2	新增内置爬虫源i笔趣阁	2021-02-05 00:17:19 +08:00
xiongxiaoyang	19d4c6b778	修复部分分页接口的查询bug	2021-02-04 23:59:26 +08:00
xiongxiaoyang	d22200b8c7	文档update	2021-01-28 09:00:36 +08:00
xiongxiaoyang	43fe1150fd	文档update	2021-01-28 08:58:20 +08:00
xiongxiaoyang	65b65f874f	文档update	2021-01-28 08:46:56 +08:00
xiongxiaoyang	3b6bc859a5	文档update	2021-01-28 08:35:08 +08:00
xiongxiaoyang	cfc55a6c92	update	2021-01-28 08:33:05 +08:00
xiongxiaoyang	0a80c5662d	update	2021-01-28 08:28:03 +08:00
xiongxiaoyang	02fd0d7e25	模版更新	2021-01-25 18:10:47 +08:00
xiongxiaoyang	521142a792	v3.5.1发布	2021-01-25 16:56:41 +08:00
xiongxiaoyang	c567e37423	v3.5.1发布	2021-01-25 14:56:05 +08:00
xiongxiaoyang	b5e0814eb4	小说内容页性能优化	2021-01-25 14:14:54 +08:00
xiongxiaoyang	ca6c2aec96	update	2021-01-24 14:07:14 +08:00
xiongxiaoyang	34859c839b	update	2021-01-22 10:18:25 +08:00
xiongxiaoyang	039f9d9cf8	update	2021-01-21 21:03:08 +08:00
xiongxiaoyang	224829dd1f	v3.5.0发布	2021-01-19 19:39:33 +08:00
xiongxiaoyang	1a5122209a	个人中心新增头像设置	2021-01-19 19:34:14 +08:00
xiongxiaoyang	48aff7cf37	个人中心新增头像设置	2021-01-19 19:32:32 +08:00
xiongxiaoyang	e673f9be9d	新增启动banner	2021-01-19 19:00:54 +08:00
xiongxiaoyang	20469bd669	增加生产环境配置	2021-01-19 18:53:47 +08:00
xiongxiaoyang	755300db3c	update	2021-01-14 23:26:38 +08:00
xiongxiaoyang	a790f8042d	update	2021-01-14 23:22:03 +08:00
xiongxiaoyang	d0db2021a6	v3.4.1发布	2021-01-10 17:55:48 +08:00
xiongxiaoyang	c403fc7496	更新orange主题手机端首尾章节跳转逻辑	2021-01-07 20:59:19 +08:00
xiongxiaoyang	e4927d7ac6	爬虫管理系统设置session默认超时时间为1天，解决由于编写爬虫规则时间过长导致的提交失败问题	2021-01-05 21:46:01 +08:00
xiongxiaoyang	a00a2141f2	爬虫管理系统设置session默认超时时间为1天，解决由于编写爬虫规则时间过长导致的提交失败问题	2021-01-05 21:45:04 +08:00
xiongxiaoyang	7cc7d8b541	v3.4.0发布	2021-01-04 10:28:01 +08:00
xiongxiaoyang	e4822979e2	elasticsearch升级到7.x，集成RestHighLevelClient客户端	2021-01-03 13:42:40 +08:00
xiongxiaoyang	ab741ec6bf	v3.3.0发布	2020-12-28 12:06:19 +08:00
xiongxiaoyang	057c0646cd	v3.3.0发布	2020-12-28 12:02:34 +08:00
xiongxiaoyang	57a9cd09ef	v3.3.0发布	2020-12-28 11:06:27 +08:00
xiongxiaoyang	1a49e2a340	增加外部配置文件来配置网站信息	2020-12-28 10:58:38 +08:00
xiongxiaoyang	f8411c2337	v3.3.0发布	2020-12-28 09:34:22 +08:00
xiongxiaoyang	343a741c21	更新展示图片	2020-12-27 15:54:50 +08:00
xiongxiaoyang	f1a5fb4813	更新展示图片	2020-12-27 15:34:23 +08:00
xiongxiaoyang	0428356bd4	新增蓝色主题模版	2020-12-27 09:43:45 +08:00
xiongxiaoyang	c01097cd5f	更新v3.3.0的安装文档	2020-12-26 23:53:05 +08:00
xiongxiaoyang	7e650a0a04	修改版本号	2020-12-26 22:27:51 +08:00
xiongxiaoyang	45c59ecc37	前端新增深色主题模版	2020-12-26 22:16:58 +08:00
xiongxiaoyang	5e3962fef4	update	2020-12-26 20:10:11 +08:00
xiongxiaoyang	7f5035e369	update	2020-12-26 20:08:07 +08:00
xiongxiaoyang	44aad39847	update	2020-12-26 20:00:21 +08:00
xiongxiaoyang	6ad51908d5	文件夹结构调整，新增模版自定义功能	2020-12-26 19:13:07 +08:00
				`@ -0,0 +1 @@`
				alter table news add column `read_count` BIGINT NOT NULL DEFAULT '0' COMMENT '阅读量' after content;
				`@ -0,0 +1,3 @@`
				`alter table book_index add column storage_type varchar(10) NOT NULL DEFAULT 'db' COMMENT '存储方式' after book_price ;`