chore: 模版更新

顶部推荐栏重复渲染同一本小说

.gitignore

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

README.md

@@ -1,226 +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> 
 
-基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
+## 项目介绍
 
-Gitee仓库地址： https://gitee.com/xiongxyang/novel-cloud
+novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
+系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、会员充值、订阅模式、新闻发布和实时统计报表。
 
-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)
 
-[网站1，点击前往](http://www.bqmfxs.cn)
-
-[网站2，点击前往](http://iyuedu.space)
-
-[网站3，点击前往](http://suxiange.com)
-
-[网站4，点击前往](http://ruoshu.com)
-
-[网站5，点击前往](https://www.jingjiao.net)
-
-[网站6，点击前往](http://www.shucheng.in)
-
-#### 前言
-
-小说精品屋-plus致力于打造一个完整的商用小说门户平台，使用前建议先阅读此文档。
-
-#### 项目介绍
-
-小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
-
-小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
-
-- [x] 数据库重新设计，结构调整。
-- [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
-- [x] 移动站与PC站站点分离，浏览器自动识别跳转。
-- [x] PC站UI更新。
-- [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 框架
 
-#### PC站截图
+## 项目演示
 
-1. 首页
+https://www.bilibili.com/video/BV1Zo4y187Mi
 
-![img](https://oscimg.oschina.net/oscnet/up-bbb1c7f72e183327bff754a9fa8bb75223e.png)
+## 增值服务
 
-2. 分类索引页
+👉 [了解详情](https://novel.xxyopen.com/service.htm)
 
-![img](https://oscimg.oschina.net/oscnet/up-d0b2e03129bfae47b8bb96a491b73d383c5.png)
+## 微信公众号
 
-3. 搜索页
+发布最新更新动态、最新前端模版、最新爬虫规则、文档教程等。
 
-![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ20200520-215756.png)
+![](https://youdoc.github.io/img/qrcode_for_gh.jpg)
 
-![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. 首页
-
-   ![index](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ%E5%9B%BE%E7%89%8720191018162208.jpg)
-
-2. 小说详情页
-
-   ![微信图片_20190904181558](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20190904181558.png)
-
-3. 目录页
-
-   ![QQ图片20191018161901](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ%E5%9B%BE%E7%89%8720191108022250.png)
-
-4. 小说阅读页
-
-   ![QQ图片20191018161901](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ%E5%9B%BE%E7%89%8720191018161901.png)
-
-#### 爬虫管理系统截图
-
-![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://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)
-
-#### 代码仓库
-
- Gitee仓库地址： https://gitee.com/xiongxyang/novel-plus
-
- GitHub仓库地址： https://github.com/201206030/novel-plus 
-
-#### QQ交流群
-
-![mini-code](https://s1.ax1x.com/2020/10/31/BUQVeI.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 )
+本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。

doc/api/api.md

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

doc/sql/20201122.sql

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

doc/sql/20201201.sql

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

doc/sql/20210726.sql

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

doc/sql/20210913.sql

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

doc/sql/20230413.sql

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

doc/sql/readme.md

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

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>1.0.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>

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

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

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

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

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

@@ -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"));
+        };
+    }
+
 }

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

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

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

@@ -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/";
+
+
 }

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;
-
-
-    }
-
-
-}
-
-

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();
-    }
-
-
-
-
 }

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());
+    }
 
 }

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();
+    }
 
 
 }

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);
 }

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);
+    }
 }

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

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;
+    }
+}

novel-admin/src/main/java/com/java2nb/common/utils/DateUtils.java

@@ -1,10 +1,14 @@
 package com.java2nb.common.utils;
 
+import lombok.SneakyThrows;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 日期处理
@@ -91,4 +95,37 @@ public class DateUtils {
         r += "前";
         return r;
     }
+
+    /**
+     * 获取过去第几天的日期
+     *
+     * @param past
+     * @return
+     */
+    @SneakyThrows
+    public static String getPastDate(int past,Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - past);
+        Date today = calendar.getTime();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        return sdf.format(today);
+    }
+
+    /**
+     * 获取过去几天的日期集合
+     *
+     * @param past
+     * @return
+     */
+    public static List<String> getDateList(int past,Date date) {
+        List<String> result = new ArrayList<>(past);
+        for(int i = past - 1 ; i > 0 ; i--){
+            result.add(getPastDate(i,date));
+        }
+        //今天的日期
+        result.add(new SimpleDateFormat("yyyy-MM-dd").format(date));
+        return result;
+
+    }
 }

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;
-        }
-    }
-}

novel-admin/src/main/java/com/java2nb/common/xss/XssAndSqlHttpServletRequestWrapper.java

@@ -14,7 +14,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe
     /**
      * 假如有有html 代码是自己传来的  需要设定对应的name 不过滤
      */
-    private static final List<String> noFilterNames = Arrays.asList("attach","push_ip");
+    private static final List<String> noFilterNames = Arrays.asList("attach","push_ip","content");
 
     public XssAndSqlHttpServletRequestWrapper(HttpServletRequest request) {
         super(request);

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();
+    }
+
+}

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();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/BookController.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.BookDO;
+import com.java2nb.novel.service.BookService;
+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 2020-12-01 03:49:46
+ */
+
+@Controller
+@RequestMapping("/novel/book")
+public class BookController {
+    @Autowired
+    private BookService bookService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:book:book")
+    String Book() {
+        return "novel/book/book";
+    }
+
+    @ApiOperation(value = "获取小说表列表", notes = "获取小说表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:book:book")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<BookDO> bookList = bookService.list(query);
+        int total = bookService.count(query);
+        PageBean pageBean = new PageBean(bookList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增小说表页面", notes = "新增小说表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:book:add")
+    String add() {
+        return "novel/book/add";
+    }
+
+    @ApiOperation(value = "修改小说表页面", notes = "修改小说表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:book:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            BookDO book = bookService.get(id);
+        model.addAttribute("book", book);
+        return "novel/book/edit";
+    }
+
+    @ApiOperation(value = "查看小说表页面", notes = "查看小说表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:book:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			BookDO book = bookService.get(id);
+        model.addAttribute("book", book);
+        return "novel/book/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增小说表", notes = "新增小说表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:book:add")
+    public R save( BookDO book) {
+        if (bookService.save(book) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改小说表", notes = "修改小说表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:book:edit")
+    public R update( BookDO book) {
+            bookService.update(book);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除小说表", notes = "删除小说表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:book:remove")
+    public R remove( Long id) {
+        if (bookService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除小说表", notes = "批量删除小说表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:book:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            bookService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

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();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/CategoryController.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.CategoryDO;
+import com.java2nb.novel.service.CategoryService;
+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 2020-12-01 10:03:41
+ */
+
+@Controller
+@RequestMapping("/novel/category")
+public class CategoryController {
+    @Autowired
+    private CategoryService categoryService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:category:category")
+    String Category() {
+        return "novel/category/category";
+    }
+
+    @ApiOperation(value = "获取新闻类别表列表", notes = "获取新闻类别表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:category:category")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<CategoryDO> categoryList = categoryService.list(query);
+        int total = categoryService.count(query);
+        PageBean pageBean = new PageBean(categoryList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增新闻类别表页面", notes = "新增新闻类别表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:category:add")
+    String add() {
+        return "novel/category/add";
+    }
+
+    @ApiOperation(value = "修改新闻类别表页面", notes = "修改新闻类别表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:category:edit")
+    String edit(@PathVariable("id") Integer id, Model model) {
+            CategoryDO category = categoryService.get(id);
+        model.addAttribute("category", category);
+        return "novel/category/edit";
+    }
+
+    @ApiOperation(value = "查看新闻类别表页面", notes = "查看新闻类别表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:category:detail")
+    String detail(@PathVariable("id") Integer id, Model model) {
+			CategoryDO category = categoryService.get(id);
+        model.addAttribute("category", category);
+        return "novel/category/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增新闻类别表", notes = "新增新闻类别表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:category:add")
+    public R save( CategoryDO category) {
+        if (categoryService.save(category) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改新闻类别表", notes = "修改新闻类别表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:category:edit")
+    public R update( CategoryDO category) {
+            categoryService.update(category);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除新闻类别表", notes = "删除新闻类别表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:category:remove")
+    public R remove( Integer id) {
+        if (categoryService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除新闻类别表", notes = "批量删除新闻类别表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:category:batchRemove")
+    public R remove(@RequestParam("ids[]") Integer[] ids) {
+            categoryService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

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();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/NewsController.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.NewsDO;
+import com.java2nb.novel.service.NewsService;
+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 2020-12-01 10:05:51
+ */
+
+@Controller
+@RequestMapping("/novel/news")
+public class NewsController {
+    @Autowired
+    private NewsService newsService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:news:news")
+    String News() {
+        return "novel/news/news";
+    }
+
+    @ApiOperation(value = "获取新闻表列表", notes = "获取新闻表列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:news:news")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<NewsDO> newsList = newsService.list(query);
+        int total = newsService.count(query);
+        PageBean pageBean = new PageBean(newsList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增新闻表页面", notes = "新增新闻表页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:news:add")
+    String add() {
+        return "novel/news/add";
+    }
+
+    @ApiOperation(value = "修改新闻表页面", notes = "修改新闻表页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:news:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            NewsDO news = newsService.get(id);
+        model.addAttribute("news", news);
+        return "novel/news/edit";
+    }
+
+    @ApiOperation(value = "查看新闻表页面", notes = "查看新闻表页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:news:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			NewsDO news = newsService.get(id);
+        model.addAttribute("news", news);
+        return "novel/news/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增新闻表", notes = "新增新闻表")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:news:add")
+    public R save( NewsDO news) {
+        if (newsService.save(news) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改新闻表", notes = "修改新闻表")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:news:edit")
+    public R update( NewsDO news) {
+            newsService.update(news);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除新闻表", notes = "删除新闻表")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:news:remove")
+    public R remove( Long id) {
+        if (newsService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除新闻表", notes = "批量删除新闻表")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:news:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            newsService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/PayController.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.PayDO;
+import com.java2nb.novel.service.PayService;
+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 2020-12-01 03:49:57
+ */
+
+@Controller
+@RequestMapping("/novel/pay")
+public class PayController {
+    @Autowired
+    private PayService payService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:pay:pay")
+    String Pay() {
+        return "novel/pay/pay";
+    }
+
+    @ApiOperation(value = "获取充值订单列表", notes = "获取充值订单列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:pay:pay")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<PayDO> payList = payService.list(query);
+        int total = payService.count(query);
+        PageBean pageBean = new PageBean(payList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增充值订单页面", notes = "新增充值订单页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:pay:add")
+    String add() {
+        return "novel/pay/add";
+    }
+
+    @ApiOperation(value = "修改充值订单页面", notes = "修改充值订单页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:pay:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            PayDO pay = payService.get(id);
+        model.addAttribute("pay", pay);
+        return "novel/pay/edit";
+    }
+
+    @ApiOperation(value = "查看充值订单页面", notes = "查看充值订单页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:pay:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			PayDO pay = payService.get(id);
+        model.addAttribute("pay", pay);
+        return "novel/pay/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增充值订单", notes = "新增充值订单")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:pay:add")
+    public R save( PayDO pay) {
+        if (payService.save(pay) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改充值订单", notes = "修改充值订单")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:pay:edit")
+    public R update( PayDO pay) {
+            payService.update(pay);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除充值订单", notes = "删除充值订单")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:pay:remove")
+    public R remove( Long id) {
+        if (payService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除充值订单", notes = "批量删除充值订单")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:pay:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            payService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/StatController.java

@@ -0,0 +1,81 @@
+package com.java2nb.novel.controller;
+
+import com.java2nb.common.utils.DateUtils;
+import com.java2nb.common.utils.R;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 统计
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 03:40:12
+ */
+
+@Controller
+@RequestMapping("/novel/stat")
+public class StatController {
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private AuthorService authorService;
+
+    @Autowired
+    private BookService bookService;
+
+    @Autowired
+    private PayService orderPayService;
+
+
+    @ResponseBody
+    @GetMapping("/countSta")
+    public R countUser() {
+        Map map = new HashMap<>(0);
+        int userCount = userService.count(map);
+        int authorCount = authorService.count(map);
+        int bookCount = bookService.count(map);
+        int orderCount = orderPayService.count(map);
+        return R.ok().put("userCount",userCount)
+                .put("authorCount",authorCount)
+                .put("bookCount",bookCount)
+                .put("orderCount",orderCount);
+    }
+
+    @ResponseBody
+    @GetMapping("/tableSta")
+    @SneakyThrows
+    public R tableSta() {
+        Date currentDate = new Date();
+        List<String> dateList = DateUtils.getDateList(7,currentDate);
+        Date minDate = new SimpleDateFormat("yyyy-MM-dd").parse(dateList.get(0));
+        Map<Object,Object> userTableSta = userService.tableSta(minDate);
+        Map<Object,Object> bookTableSta = bookService.tableSta(minDate);
+        Map<Object,Object> authorTableSta = authorService.tableSta(minDate);
+        Map<Object,Object> orderTableSta = orderPayService.tableSta(minDate);
+        return R.ok().put("dateList",dateList)
+                .put("userTableSta",userTableSta)
+                .put("bookTableSta",bookTableSta)
+                .put("authorTableSta",authorTableSta)
+                .put("orderTableSta",orderTableSta)
+                ;
+    }
+
+
+
+}

novel-admin/src/main/java/com/java2nb/novel/controller/UserController.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.UserDO;
+import com.java2nb.novel.service.UserService;
+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 2020-12-01 03:49:08
+ */
+
+@Controller
+@RequestMapping("/novel/user")
+public class UserController {
+    @Autowired
+    private UserService userService;
+
+    @GetMapping()
+    @RequiresPermissions("novel:user:user")
+    String User() {
+        return "novel/user/user";
+    }
+
+    @ApiOperation(value = "获取列表", notes = "获取列表")
+    @ResponseBody
+    @GetMapping("/list")
+    @RequiresPermissions("novel:user:user")
+    public R list(@RequestParam Map<String, Object> params) {
+        //查询列表数据
+        Query query = new Query(params);
+        List<UserDO> userList = userService.list(query);
+        int total = userService.count(query);
+        PageBean pageBean = new PageBean(userList, total);
+        return R.ok().put("data", pageBean);
+    }
+
+    @ApiOperation(value = "新增页面", notes = "新增页面")
+    @GetMapping("/add")
+    @RequiresPermissions("novel:user:add")
+    String add() {
+        return "novel/user/add";
+    }
+
+    @ApiOperation(value = "修改页面", notes = "修改页面")
+    @GetMapping("/edit/{id}")
+    @RequiresPermissions("novel:user:edit")
+    String edit(@PathVariable("id") Long id, Model model) {
+            UserDO user = userService.get(id);
+        model.addAttribute("user", user);
+        return "novel/user/edit";
+    }
+
+    @ApiOperation(value = "查看页面", notes = "查看页面")
+    @GetMapping("/detail/{id}")
+    @RequiresPermissions("novel:user:detail")
+    String detail(@PathVariable("id") Long id, Model model) {
+			UserDO user = userService.get(id);
+        model.addAttribute("user", user);
+        return "novel/user/detail";
+    }
+
+    /**
+     * 保存
+     */
+    @ApiOperation(value = "新增", notes = "新增")
+    @ResponseBody
+    @PostMapping("/save")
+    @RequiresPermissions("novel:user:add")
+    public R save( UserDO user) {
+        if (userService.save(user) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 修改
+     */
+    @ApiOperation(value = "修改", notes = "修改")
+    @ResponseBody
+    @RequestMapping("/update")
+    @RequiresPermissions("novel:user:edit")
+    public R update( UserDO user) {
+            userService.update(user);
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "删除", notes = "删除")
+    @PostMapping("/remove")
+    @ResponseBody
+    @RequiresPermissions("novel:user:remove")
+    public R remove( Long id) {
+        if (userService.remove(id) > 0) {
+            return R.ok();
+        }
+        return R.error();
+    }
+
+    /**
+     * 删除
+     */
+    @ApiOperation(value = "批量删除", notes = "批量删除")
+    @PostMapping("/batchRemove")
+    @ResponseBody
+    @RequiresPermissions("novel:user:batchRemove")
+    public R remove(@RequestParam("ids[]") Long[] ids) {
+            userService.batchRemove(ids);
+        return R.ok();
+    }
+
+}

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();
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/dao/AuthorDao.java

@@ -2,6 +2,7 @@ package com.java2nb.novel.dao;
 
 import com.java2nb.novel.domain.AuthorDO;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -29,4 +30,6 @@ public interface AuthorDao {
 	int remove(Long id);
 	
 	int batchRemove(Long[] ids);
+
+    List<Map<Object, Object>> tableSta(Date minDate);
 }

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);
+}

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);
+}

novel-admin/src/main/java/com/java2nb/novel/dao/BookDao.java

@@ -0,0 +1,38 @@
+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;
+
+/**
+ * 小说表
+ *
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 03:49:46
+ */
+@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);
+
+    List<Map<Object, Object>> tableSta(Date minDate);
+
+    List<BookDO> batchGet(List<Long> ids);
+
+}

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);
+}

novel-admin/src/main/java/com/java2nb/novel/dao/CategoryDao.java

@@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.CategoryDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 新闻类别表
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 10:03:41
+ */
+@Mapper
+public interface CategoryDao {
+
+	CategoryDO get(Integer id);
+	
+	List<CategoryDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(CategoryDO category);
+	
+	int update(CategoryDO category);
+	
+	int remove(Integer id);
+	
+	int batchRemove(Integer[] ids);
+}

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);
+}

novel-admin/src/main/java/com/java2nb/novel/dao/NewsDao.java

@@ -0,0 +1,32 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.NewsDO;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 新闻表
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 10:05:51
+ */
+@Mapper
+public interface NewsDao {
+
+	NewsDO get(Long id);
+	
+	List<NewsDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(NewsDO news);
+	
+	int update(NewsDO news);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

novel-admin/src/main/java/com/java2nb/novel/dao/PayDao.java

@@ -0,0 +1,35 @@
+package com.java2nb.novel.dao;
+
+import com.java2nb.novel.domain.PayDO;
+
+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:57
+ */
+@Mapper
+public interface PayDao {
+
+	PayDO get(Long id);
+	
+	List<PayDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(PayDO pay);
+	
+	int update(PayDO pay);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+
+    List<Map<Object, Object>> tableSta(Date minDate);
+}

novel-admin/src/main/java/com/java2nb/novel/dao/UserDao.java

@@ -0,0 +1,35 @@
+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;
+
+/**
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 03:49:08
+ */
+@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);
+
+    List<Map<Object, Object>> tableSta(Date minDate);
+
+    List<UserDO> batchGet(List<Long> userIds);
+}

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);
+}

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;
+    }
+}

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;
+	}
+}

novel-admin/src/main/java/com/java2nb/novel/domain/BookDO.java

@@ -0,0 +1,455 @@
+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 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;
+    //小说封面
+    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;
+    }
+}

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;
+	}
+}

novel-admin/src/main/java/com/java2nb/novel/domain/CategoryDO.java

@@ -0,0 +1,135 @@
+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 2020-12-01 10:03:41
+ */
+public class CategoryDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+			private Integer id;
+	//分类名
+			private String name;
+	//排序
+			private Integer sort;
+	//
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long createUserId;
+	//
+			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+		private Date createTime;
+	//
+		//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 setName(String name) {
+		this.name = name;
+	}
+	/**
+	 * 获取：分类名
+	 */
+	public String getName() {
+		return name;
+	}
+	/**
+	 * 设置：排序
+	 */
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+	/**
+	 * 获取：排序
+	 */
+	public Integer getSort() {
+		return sort;
+	}
+	/**
+	 * 设置：
+	 */
+	public void setCreateUserId(Long createUserId) {
+		this.createUserId = createUserId;
+	}
+	/**
+	 * 获取：
+	 */
+	public Long getCreateUserId() {
+		return createUserId;
+	}
+	/**
+	 * 设置：
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	/**
+	 * 获取：
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+	/**
+	 * 设置：
+	 */
+	public void setUpdateUserId(Long updateUserId) {
+		this.updateUserId = updateUserId;
+	}
+	/**
+	 * 获取：
+	 */
+	public Long getUpdateUserId() {
+		return updateUserId;
+	}
+	/**
+	 * 设置：
+	 */
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	/**
+	 * 获取：
+	 */
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+}

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;
+	}
+}

novel-admin/src/main/java/com/java2nb/novel/domain/NewsDO.java

@@ -0,0 +1,180 @@
+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 2020-12-01 10:05:51
+ */
+public class NewsDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long id;
+	//类别ID
+			private Integer catId;
+	//分类名
+			private String catName;
+	//来源
+			private String sourceName;
+	//标题
+			private String title;
+	//内容
+			private String content;
+	//发布时间
+			@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;
+	}
+	/**
+	 * 设置：类别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 setSourceName(String sourceName) {
+		this.sourceName = sourceName;
+	}
+	/**
+	 * 获取：来源
+	 */
+	public String getSourceName() {
+		return sourceName;
+	}
+	/**
+	 * 设置：标题
+	 */
+	public void setTitle(String title) {
+		this.title = title;
+	}
+	/**
+	 * 获取：标题
+	 */
+	public String getTitle() {
+		return title;
+	}
+	/**
+	 * 设置：内容
+	 */
+	public void setContent(String content) {
+		this.content = content;
+	}
+	/**
+	 * 获取：内容
+	 */
+	public String getContent() {
+		return content;
+	}
+	/**
+	 * 设置：发布时间
+	 */
+	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;
+	}
+}

novel-admin/src/main/java/com/java2nb/novel/domain/PayDO.java

@@ -0,0 +1,188 @@
+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 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 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;
+    }
+}

novel-admin/src/main/java/com/java2nb/novel/domain/UserDO.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 2020-12-01 03:49:08
+ */
+public class UserDO implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	
+	//主键
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long id;
+	//登录名
+			private String username;
+	//登录密码
+			private String password;
+	//昵称
+			private String nickName;
+	//用户头像
+			private String userPhoto;
+	//用户性别，0：男，1：女
+			private Integer userSex;
+	//账户余额
+		//java中的long能表示的范围比js中number大,也就意味着部分数值在js中存不下(变成不准确的值)
+	//所以通过序列化成字符串来解决
+	@JsonSerialize(using = LongToStringSerializer.class)
+			private Long accountBalance;
+	//用户状态，0：正常
+			private Integer status;
+	//创建时间
+			@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;
+	}
+	/**
+	 * 设置：登录名
+	 */
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	/**
+	 * 获取：登录名
+	 */
+	public String getUsername() {
+		return username;
+	}
+	/**
+	 * 设置：登录密码
+	 */
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	/**
+	 * 获取：登录密码
+	 */
+	public String getPassword() {
+		return password;
+	}
+	/**
+	 * 设置：昵称
+	 */
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	/**
+	 * 获取：昵称
+	 */
+	public String getNickName() {
+		return nickName;
+	}
+	/**
+	 * 设置：用户头像
+	 */
+	public void setUserPhoto(String userPhoto) {
+		this.userPhoto = userPhoto;
+	}
+	/**
+	 * 获取：用户头像
+	 */
+	public String getUserPhoto() {
+		return userPhoto;
+	}
+	/**
+	 * 设置：用户性别，0：男，1：女
+	 */
+	public void setUserSex(Integer userSex) {
+		this.userSex = userSex;
+	}
+	/**
+	 * 获取：用户性别，0：男，1：女
+	 */
+	public Integer getUserSex() {
+		return userSex;
+	}
+	/**
+	 * 设置：账户余额
+	 */
+	public void setAccountBalance(Long accountBalance) {
+		this.accountBalance = accountBalance;
+	}
+	/**
+	 * 获取：账户余额
+	 */
+	public Long getAccountBalance() {
+		return accountBalance;
+	}
+	/**
+	 * 设置：用户状态，0：正常
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	/**
+	 * 获取：用户状态，0：正常
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+	/**
+	 * 设置：创建时间
+	 */
+	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;
+	}
+}

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;
+	}
+}

novel-admin/src/main/java/com/java2nb/novel/service/AuthorService.java

@@ -2,6 +2,7 @@ package com.java2nb.novel.service;
 
 import com.java2nb.novel.domain.AuthorDO;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -27,4 +28,6 @@ public interface AuthorService {
 	int remove(Long id);
 	
 	int batchRemove(Long[] ids);
+
+    Map<Object, Object> tableSta(Date minDate);
 }

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);
+}

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);
+}

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);
+}

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

@@ -0,0 +1,33 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.BookDO;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 小说表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 03:49:46
+ */
+public interface BookService {
+	
+	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);
+
+    Map<Object, Object> tableSta(Date minDate);
+}

novel-admin/src/main/java/com/java2nb/novel/service/CategoryService.java

@@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.CategoryDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 新闻类别表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 10:03:41
+ */
+public interface CategoryService {
+	
+	CategoryDO get(Integer id);
+	
+	List<CategoryDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(CategoryDO category);
+	
+	int update(CategoryDO category);
+	
+	int remove(Integer id);
+	
+	int batchRemove(Integer[] ids);
+}

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);
+}

novel-admin/src/main/java/com/java2nb/novel/service/NewsService.java

@@ -0,0 +1,30 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.NewsDO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 新闻表
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 10:05:51
+ */
+public interface NewsService {
+	
+	NewsDO get(Long id);
+	
+	List<NewsDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(NewsDO news);
+	
+	int update(NewsDO news);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+}

novel-admin/src/main/java/com/java2nb/novel/service/PayService.java

@@ -0,0 +1,33 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.PayDO;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 充值订单
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 03:49:57
+ */
+public interface PayService {
+	
+	PayDO get(Long id);
+	
+	List<PayDO> list(Map<String, Object> map);
+	
+	int count(Map<String, Object> map);
+	
+	int save(PayDO pay);
+	
+	int update(PayDO pay);
+	
+	int remove(Long id);
+	
+	int batchRemove(Long[] ids);
+
+    Map<Object, Object> tableSta(Date minDate);
+}

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

@@ -0,0 +1,33 @@
+package com.java2nb.novel.service;
+
+import com.java2nb.novel.domain.UserDO;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 
+ * 
+ * @author xiongxy
+ * @email 1179705413@qq.com
+ * @date 2020-12-01 03:49:08
+ */
+public interface UserService {
+	
+	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);
+
+    Map<Object, Object> tableSta(Date minDate);
+}

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);
+}

novel-admin/src/main/java/com/java2nb/novel/service/impl/AuthorServiceImpl.java

@@ -3,8 +3,10 @@ package com.java2nb.novel.service.impl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.java2nb.novel.dao.AuthorDao;
 import com.java2nb.novel.domain.AuthorDO;
@@ -51,5 +53,14 @@ public class AuthorServiceImpl implements AuthorService {
 	public int batchRemove(Long[] ids){
 		return authorDao.batchRemove(ids);
 	}
-	
+
+	@Override
+	public Map<Object, Object> tableSta(Date minDate) {
+		List<Map<Object, Object>> maps = authorDao.tableSta(minDate);
+
+		return maps.stream().collect(Collectors.toMap(x -> x.get("staDate"), x -> x.get("authorCount")));
+
+
+	}
+
 }

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);
+    }
+
+}

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);
+	}
+	
+}

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);
+	}
+	
+}

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

@@ -0,0 +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;
+
+
+@Service
+public class BookServiceImpl implements BookService {
+
+    @Autowired
+    private BookDao bookDao;
+    @Autowired
+    private BookIndexDao bookIndexDao;
+    @Autowired
+    private BookContentDao bookContentDao;
+
+    @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")));
+
+    }
+
+}

novel-admin/src/main/java/com/java2nb/novel/service/impl/CategoryServiceImpl.java

@@ -0,0 +1,58 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.java2nb.novel.dao.CategoryDao;
+import com.java2nb.novel.domain.CategoryDO;
+import com.java2nb.novel.service.CategoryService;
+
+
+
+@Service
+public class CategoryServiceImpl implements CategoryService {
+	@Autowired
+	private CategoryDao categoryDao;
+	
+	@Override
+	public CategoryDO get(Integer id){
+		return categoryDao.get(id);
+	}
+	
+	@Override
+	public List<CategoryDO> list(Map<String, Object> map){
+		return categoryDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return categoryDao.count(map);
+	}
+	
+	@Override
+	public int save(CategoryDO category){
+		category.setCreateTime(new Date());
+		return categoryDao.save(category);
+	}
+	
+	@Override
+	public int update(CategoryDO category){
+		category.setUpdateTime(new Date());
+		return categoryDao.update(category);
+	}
+	
+	@Override
+	public int remove(Integer id){
+		return categoryDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Integer[] ids){
+		return categoryDao.batchRemove(ids);
+	}
+	
+}

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);
+	}
+	
+}

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

@@ -0,0 +1,58 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.java2nb.novel.dao.NewsDao;
+import com.java2nb.novel.domain.NewsDO;
+import com.java2nb.novel.service.NewsService;
+
+
+
+@Service
+public class NewsServiceImpl implements NewsService {
+	@Autowired
+	private NewsDao newsDao;
+	
+	@Override
+	public NewsDO get(Long id){
+		return newsDao.get(id);
+	}
+	
+	@Override
+	public List<NewsDO> list(Map<String, Object> map){
+		return newsDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return newsDao.count(map);
+	}
+	
+	@Override
+	public int save(NewsDO news){
+		news.setCreateTime(new Date());
+		return newsDao.save(news);
+	}
+	
+	@Override
+	public int update(NewsDO news){
+		news.setUpdateTime(new Date());
+		return newsDao.update(news);
+	}
+	
+	@Override
+	public int remove(Long id){
+		return newsDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Long[] ids){
+		return newsDao.batchRemove(ids);
+	}
+	
+}

novel-admin/src/main/java/com/java2nb/novel/service/impl/PayServiceImpl.java

@@ -0,0 +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;
+
+
+@Service
+public class PayServiceImpl implements PayService {
+
+    @Autowired
+    private PayDao payDao;
+    @Autowired
+    private UserDao userDao;
+
+    @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")));
+
+
+    }
+
+}

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

@@ -0,0 +1,65 @@
+package com.java2nb.novel.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import com.java2nb.novel.dao.UserDao;
+import com.java2nb.novel.domain.UserDO;
+import com.java2nb.novel.service.UserService;
+
+
+
+@Service
+public class UserServiceImpl implements UserService {
+	@Autowired
+	private UserDao userDao;
+	
+	@Override
+	public UserDO get(Long id){
+		return userDao.get(id);
+	}
+	
+	@Override
+	public List<UserDO> list(Map<String, Object> map){
+		return userDao.list(map);
+	}
+	
+	@Override
+	public int count(Map<String, Object> map){
+		return userDao.count(map);
+	}
+	
+	@Override
+	public int save(UserDO user){
+		return userDao.save(user);
+	}
+	
+	@Override
+	public int update(UserDO user){
+		return userDao.update(user);
+	}
+	
+	@Override
+	public int remove(Long id){
+		return userDao.remove(id);
+	}
+	
+	@Override
+	public int batchRemove(Long[] ids){
+		return userDao.batchRemove(ids);
+	}
+
+	@Override
+	public Map<Object, Object> tableSta(Date minDate) {
+
+		List<Map<Object, Object>> maps = userDao.tableSta(minDate);
+
+		return maps.stream().collect(Collectors.toMap(x -> x.get("staDate"), x -> x.get("userCount")));
+	}
+
+}

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);
+	}
+	
+}

novel-admin/src/main/java/com/java2nb/system/controller/SysUserController.java

@@ -0,0 +1,248 @@
+package com.java2nb.system.controller;
+
+import com.java2nb.common.annotation.Log;
+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.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 org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+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;
+
+    @RequiresPermissions("sys:user:user")
+    @GetMapping("")
+    String user(Model model) {
+        return prefix + "/user";
+    }
+
+    @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:add")
+    @Log("添加用户")
+    @GetMapping("/add")
+    String add(Model model) {
+        List<RoleDO> roles = roleService.list();
+        model.addAttribute("roles", roles);
+        return prefix + "/add";
+    }
+
+    @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";
+    }
+
+    public static void main(String[] args) {
+        System.out.println(MD5Utils.encrypt("admin", "admin"));
+    }
+
+    @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: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();
+    }
+
+    @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) {
+
+        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());
+        }
+
+    }
+
+    @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;
+    }
+
+    @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("更新图像失败！");
+        }
+    }
+}

novel-admin/src/main/java/com/java2nb/system/controller/UserController.java

@@ -1,244 +0,0 @@
-package com.java2nb.system.controller;
-
-import com.java2nb.common.annotation.Log;
-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.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.UserService;
-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;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RequestMapping("/sys/user")
-@Controller
-public class UserController extends BaseController {
-	private String prefix="system/user"  ;
-	@Autowired
-	UserService userService;
-	@Autowired
-	RoleService roleService;
-	@Autowired
-	DictService dictService;
-	@Autowired
-	RedisUtil redisUtil;
-
-	@RequiresPermissions("sys:user:user")
-	@GetMapping("")
-	String user(Model model) {
-		return prefix + "/user";
-	}
-
-	@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:add")
-	@Log("添加用户")
-	@GetMapping("/add")
-	String add(Model model) {
-		List<RoleDO> roles = roleService.list();
-		model.addAttribute("roles", roles);
-		return prefix + "/add";
-	}
-
-	@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";
-	}
-
-	public static void main(String[] args) {
-		System.out.println(MD5Utils.encrypt("admin", "admin"));
-	}
-
-	@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: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();
-	}
-
-	@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) {
-
-		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());
-		}
-
-	}
-	@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;
-	}
-
-	@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("更新图像失败！");
-		}
-	}
-}

novel-admin/src/main/java/com/java2nb/system/dao/SysUserDao.java

@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @date 2019-10-03 09:45:11
  */
 @Mapper
-public interface UserDao {
+public interface SysUserDao {
 
 	UserDO get(Long userId);
 	

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);
+    }
 }

novel-admin/src/main/java/com/java2nb/system/service/SysUserService.java

@@ -13,7 +13,7 @@ import com.java2nb.system.domain.UserDO;
 import org.springframework.web.multipart.MultipartFile;
 
 @Service
-public interface UserService {
+public interface SysUserService {
 	UserDO get(Long id);
 
 	List<UserDO> list(Map<String, Object> map);

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;
+    }
 
 }

novel-admin/src/main/java/com/java2nb/system/service/impl/RoleServiceImpl.java

@@ -8,8 +8,6 @@ import java.util.Objects;
 import com.java2nb.system.dao.*;
 import com.java2nb.system.domain.RoleDataPermDO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,7 +28,7 @@ public class RoleServiceImpl implements RoleService {
     @Autowired
     RoleMenuDao roleMenuMapper;
     @Autowired
-    UserDao userMapper;
+    SysUserDao userMapper;
     @Autowired
     UserRoleDao userRoleMapper;
     @Autowired

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,24 +21,19 @@ 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.UserDao;
-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.UserService;
 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 UserServiceImpl implements UserService {
+public class SysUserServiceImpl implements SysUserService {
+
     @Autowired
-    UserDao userMapper;
+    SysUserDao userMapper;
     @Autowired
     UserRoleDao userRoleMapper;
     @Autowired
@@ -44,7 +44,7 @@ public class UserServiceImpl implements UserService {
     private JnConfig jnConfig;
     @Autowired
     DeptService deptService;
-    private static final Logger logger = LoggerFactory.getLogger(UserService.class);
+    private static final Logger logger = LoggerFactory.getLogger(SysUserService.class);
 
     @Override
 //    @Cacheable(value = "user",key = "#id")
@@ -64,7 +64,7 @@ public class UserServiceImpl implements UserService {
             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 UserServiceImpl implements UserService {
     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(",");

novel-admin/src/main/java/com/java2nb/system/shiro/UserRealm.java

@@ -6,7 +6,6 @@ import com.java2nb.common.config.ApplicationContextRegister;
 import com.java2nb.system.dao.DataPermDao;
 import com.java2nb.system.dao.DeptDao;
 import com.java2nb.system.domain.DataPermDO;
-import com.java2nb.system.domain.UserToken;
 import org.apache.shiro.authc.AuthenticationException;
 import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
@@ -18,10 +17,9 @@ import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
 import org.apache.shiro.subject.PrincipalCollection;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import com.java2nb.common.utils.ShiroUtils;
-import com.java2nb.system.dao.UserDao;
+import com.java2nb.system.dao.SysUserDao;
 import com.java2nb.system.domain.UserDO;
 import com.java2nb.system.service.MenuService;
 
@@ -48,7 +46,7 @@ public class UserRealm extends AuthorizingRealm {
         map.put("username", username);
         String password = new String((char[]) token.getCredentials());
 
-        UserDao userMapper = ApplicationContextRegister.getBean(UserDao.class);
+        SysUserDao userMapper = ApplicationContextRegister.getBean(SysUserDao.class);
         // 查询用户信息
         UserDO user = userMapper.list(map).get(0);
 

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();
-    }
-
-}

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);
-}