feat(novel-front): 增加评论用户地理位置显示功能

MySQL 8.0+ 默认使用 caching_sha2_password 认证插件，这种认证方式有两种工作模式：
- 如果使用SSL连接，直接通过安全通道传输密码
- 如果不使用SSL连接，客户端需要从服务器获取RSA公钥来加密密码
当设置 useSSL=false 但未明确允许公钥检索时，JDBC驱动出于安全考虑会阻止这种操作（报错：Public Key Retrieval is not allowed）。
生产环境中，应优先考虑：
1. 启用 SSL/TLS 加密连接
2. 如需禁用 SSL，改用 mysql_native_password 认证
3. 仅在受控环境（如开发环境）中使用 allowPublicKeyRetrieval=true

.github/workflows/release.yml

@@ -0,0 +1,79 @@
+name: Create novel-plus Maven Release with ZIPs
+
+on:
+  push:
+    # 匹配所有以'v'开头的标签
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          # 可选，默认是 temurin，也可以选择其他发行版
+          distribution: 'temurin'
+
+      - name: Build project with Maven
+        run: mvn clean install -DskipTests=true -Pcentral-repo
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # 使用 tag_name 而不是 github.ref
+          tag_name: ${{ github.ref_name }}
+          release_name: novel-plus ${{ github.ref_name }}
+          draft: false
+          prerelease: false
+
+
+      # 使用 action 来替代直接 curl 进行上传
+      - name: Upload sql.zip
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/novel-common/target/build/sql.zip
+          asset_name: sql.zip
+          asset_content_type: application/zip
+
+      - name: Upload novel-crawl.zip
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/novel-crawl/target/build/novel-crawl.zip
+          asset_name: novel-crawl.zip
+          asset_content_type: application/zip
+
+      - name: Upload novel-front.zip
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/novel-front/target/build/novel-front.zip
+          asset_name: novel-front.zip
+          asset_content_type: application/zip
+
+      - name: Upload novel-admin.zip
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ${{ github.workspace }}/novel-admin/target/build/novel-admin.zip
+          asset_name: novel-admin.zip
+          asset_content_type: application/zip

.gitignore

@@ -3,4 +3,5 @@
 **/cachedata
 **/target
 **/*.iml
+**/.DS_Store
 

README.md

@@ -1,235 +1,131 @@
-[![index]( https://s1.ax1x.com/2020/07/03/NOSA5q.jpg )]( https://cloud.tencent.com/act/cps/redirect?redirect=1052&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console )
+<p align="center">
+    <a href="https://cloud.tencent.com/act/cps/redirect?redirect=2446&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console"><img src="https://youdoc.github.io/img/tencent.jpg" alt="AD" ></a>
+</p>
+<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>
+</p>
 
-# 小说精品屋-plus
+<p align="center">
+      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='http://117.72.165.13:8888'>演示站点</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/1.html'>安装教程</a>
+</p> 
 
-#### 新项目：小说精品屋-微服务版
+## 项目介绍
 
-基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
+novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
+系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、AI写作、会员充值、订阅模式、新闻发布和实时统计报表。
 
-GitHub仓库地址： https://github.com/201206030/novel-cloud
+## 项目地址
 
-Gitee仓库地址： https://gitee.com/novel_dev_team/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) ｜ [演示站点](http://117.72.165.13:8888)
+- 微服务版：[GitHub](https://github.com/201206030/novel-cloud) ｜ [码云](https://gitee.com/novel_dev_team/novel-cloud)
 
-#### 演示地址
+## 项目结构
-
-[点击前往](http://47.106.243.172:8888/)
-
-
-#### 前言
-
-小说精品屋-plus致力于打造一个完整的商用小说门户平台，使用前建议先阅读此文档。
-
-#### 项目介绍
-
-小说精品屋-plus是在[小说精品屋](https://github.com/201206030/fiction_house)的基础上，去除了漫画和弹幕模块，专注于小说，是一个多端（PC、移动）阅读、功能完善的小说原创/爬虫网站项目，既包含了作家专区供原创作者上传小说，又提供了爬虫工具通过规则多线程全自动采集任意小说网站数据（已兼容99%的小说网站），新书自动入库，老书自动更新。
-
-小说精品屋-plus重新进行了数据库设计、代码重构和功能增强，提升了程序整体的可读性和性能，增加了很多商用特性。主要升级如下：
-
-- [x] 数据库重新设计，结构调整。
-- [x] 服务端代码重构，MyBatis3升级为MyBatis3DynamicSql。
-- [x] 移动站与PC站站点分离，浏览器自动识别跳转。
-- [x] PC站UI更新。
-- [x] 新闻模块。
-- [x] 排行榜。
-- [x] 小说评论模块。
-- [x] 阅读主题模块。
-- [x] 作家专区。
-- [x] 充值。
-- [x] 订阅。
-- [x] 后台管理系统。
-- [x] 爬虫管理系统。
-
-#### 项目结构
 
 ```
 novel-plus -- 父工程
 ├── novel-common -- 通用模块
-├── novel-front -- 前台门户系统
+├── novel-front -- 前台门户&作家后台
-├── novel-crawl -- 爬虫管理系统
+├── novel-crawl -- 爬虫
-└── novel-admin -- 后台管理系统
+├── novel-admin -- 管理后台
+└── templates -- 前端模版
 ```
 
-#### 技术选型
+## 技术选型
 
-| 技术                 | 说明                                                         
+| 技术                  | 说明                  
-| -------------------- | ---------------------------
+|---------------------|---------------------
-| SpringBoot           | Spring应用快速开发脚手架     
+| Spring Boot         | Spring 应用快速开发脚手架    
-| MyBatis              | 持久层ORM框架 
+| Spring AI           | Spring 官方 AI 框架     
-| MyBatis Dynamic SQL  | Mybatis动态sql
+| MyBatis             | 持久层 ORM 框架          
-| PageHelper           | MyBatis分页插件
+| MyBatis Dynamic SQL | Mybatis 动态 sql      
-| MyBatisGenerator     | 持久层代码生成插件
+| PageHelper          | MyBatis 分页插件        
-| Sharding-Jdbc        | 代码层分库分表中间件
+| MyBatis Generator   | 持久层代码生成插件           
-| JJWT                 | JWT登录支持  
+| Sharding-JDBC       | 代码层分库分表中间件          
-| SpringSecurity       | 安全框架                           
+| JJWT                | JWT 登录支持            
-| Shiro                | 安全框架  
+| Spring Security     | 安全框架                
-| Ehcache              | Java进程内缓存框架(默认缓存)  
+| Apache Shiro        | 安全框架                
-| Redis                | 分布式缓存(缓存替换方案，默认关闭，一行配置开启)                               
+| Redis               | 缓存方案                
-| ElasticSearch        | 搜索引擎(搜索增强方案，默认关闭，一行配置开启)                      
+| Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案） 
-| RabbitMq             | 消息队列(流量削峰，默认关闭，一行配置开启)  
+| Lombok              | 简化对象封装工具            
-| OSS                  | 阿里云对象存储服务(图片存储方式之一，一行配置即可切换) 
+| Docker              | 应用容器引擎              
-| FastDfs              |开源轻量级分布式文件系统(图片存储方式之一，一行配置即可切换)                      
+| MySQL               | 数据库服务               
-| Redisson             | 实现分布式锁                                       
+| Thymeleaf           | 模板引擎                
-| Lombok               | 简化对象封装工具                                                                               
+| Layui               | 前端 UI 框架            
-| Docker               | 应用容器引擎   
-| Mysql                | 数据库服务   
-| Thymeleaf            | 模板引擎     
-| Layui                | 前端UI                    
 
+## 项目截图
 
-#### 接口文档
+### 绿色主题模版
 
-[点击查看接口文档示例](./doc/api.md)
+[![点击查看大图](https://www.xxyopen.com/images/green_novel.png)](https://www.xxyopen.com/images/green_novel.png)
+[![点击查看大图](https://www.xxyopen.com/images/resource/os/novel-plus/green3.png)](https://www.xxyopen.com/images/resource/os/novel-plus/green3.png)
+[![点击查看大图](https://www.xxyopen.com/images/resource/os/novel-plus/green2.png)](https://www.xxyopen.com/images/resource/os/novel-plus/green2.png)
 
-#### PC站截图
+## 演示视频
 
-1. 首页
+https://www.bilibili.com/video/BV18e41197xs
 
-![img](https://oscimg.oschina.net/oscnet/up-bbb1c7f72e183327bff754a9fa8bb75223e.png)
+## AI 功能
 
-2. 分类索引页
+novel-plus 5.x 已集成 Spring 官方最新发布的 Spring AI 框架，并推出多项 AI 功能：
 
-![img](https://oscimg.oschina.net/oscnet/up-d0b2e03129bfae47b8bb96a491b73d383c5.png)
+1. v5.0.0 版本在小说章节发布页面的文本编辑器中集成了多项智能编辑功能，包括 AI 扩写、缩写、续写及文本润色等。这些功能的设计灵感来源于百家号文章编辑器中的 AI 助手。
+2. v5.1.0 版本在小说发布页面，新增 AI 生成封面图功能。若作家未上传自定义封面图，系统将根据小说信息自动生成封面图。
 
-3. 搜索页
+目前，AI 功能仍处于实验阶段，仅实现了基础的核心功能。我们非常重视用户的实际使用体验和反馈，未来将根据用户需求和使用情况，持续优化和调整该功能。如果用户反馈积极，我们计划进一步开发更高级的 AI 功能，例如自动生成有声小说、智能情节推荐等，以全面提升 novel-plus 的创作能力和用户体验。
 
-![img](https://gitee.com/xiongxyang/novel-plus/raw/release_v2.1.0/assets/QQ20200520-215756.png)
+我们将持续关注 AI 技术的发展，并致力于将其与小说创作场景深度融合，为用户带来更智能、更便捷的创作工具。
 
-![img](https://oscimg.oschina.net/oscnet/up-ed5f689557718924acac76bc3ebca36afcb.png)
+novel-plus 项目默认使用的是第三方大模型服务平台[硅基流动](https://cloud.siliconflow.cn/i/DOgMRH9S)提供的 API（兼容 OpenAI 的相关接口，可直接通过 Spring AI 框架调用），采用的 AI 模型有对话模型`deepseek-ai/DeepSeek-R1-Distill-Llama-8B`（DeepSeek-R1 的蒸馏版本，免费使用）和生图模型`Kwai-Kolors/Kolors`（快手 Kolors 团队开发的文本到图像生成模型，免费使用）。只需注册一个硅基流动账号，创建一个 API 密钥，并将其添加到 novel-plus 项目 novel-front 模块的 yaml 配置文件中，即可体验 novel-plus 项目的 AI 写作功能。
 
-4. 排行榜
+```yaml
+spring:
+  ai:
+    openai:
+      image:
+        enabled: true
+        base-url: https://api.siliconflow.cn
+        api-key: sk-rrrupturhdofbiqzjutduuiceecpvfqlnvmgcyiaipbdikoi
+        options:
+          model: Kwai-Kolors/Kolors
+          response_format: URL
+      api-key: sk-rrrupturhdofbiqzjutduuiceecpvfqlnvmgcyiaipbdikoi
+      base-url: https://api.siliconflow.cn
+      chat:
+        options:
+          model: deepseek-ai/DeepSeek-R1-Distill-Llama-8B
+```
 
-![img](https://oscimg.oschina.net/oscnet/up-78d5a68586cd92a86c669311f414508f922.png)
+⚠️ novel-plus 项目默认使用的都是免费 AI 模型，生成效果有限。如果对生成内容有更高的要求，建议选用付费的 AI 模型。
 
-5. 详情页
+## 增值服务
 
-![img](https://oscimg.oschina.net/oscnet/up-8be2495a2869f93626b0c9c1df6f329747a.png)
+👉 [了解详情](https://novel.xxyopen.com/service.htm)
 
-6. 阅读页
+## 微信公众号
 
-![img](https://oscimg.oschina.net/oscnet/up-517c84148d2db8e11717a8bbecc57fa1be7.png)
+发布最新更新动态、最新前端模版、最新爬虫规则、文档教程等。
 
-7. 用户中心
+![](https://youdoc.github.io/img/qrcode_for_gh.jpg)
 
-![img](https://oscimg.oschina.net/oscnet/up-805a30e7a663a3fd5cb39a7ea26bc132a01.png)
+## 赞赏支持
-
-8. 充值
-
-![img](https://oscimg.oschina.net/oscnet/up-5a601b0b3af3224d0bebcfe12fc15075d34.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-face25d02c07b05b2ce954cc4bf4ee6a0cc.png)
-
-9. 作家专区
-
-![img](https://oscimg.oschina.net/oscnet/up-30766372cc7f56480ff1d7d55198204f6ea.png)
-
-![img](https://s3.ax1x.com/2020/11/17/DVFiQI.png)
-
-![img](https://s1.ax1x.com/2020/11/09/B7X5oF.png)
-
-![img](https://s1.ax1x.com/2020/11/09/B7XLsx.png)
-
-10. 购买
-
-![img](https://oscimg.oschina.net/oscnet/up-ce0f585efd82a9670335f118cf5897c85e9.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-f849960f4c1303fea77d26e64fc505a7180.png)
-
-#### 手机站截图
-
-1. 首页
-
-   <img src="https://s3.ax1x.com/2020/12/04/DbsSoj.jpg" alt="index" style="zoom:33%;" />
-
-2. 小说列表页
-
-   <img src="https://s3.ax1x.com/2020/12/04/DbrfsO.jpg" alt="微信图片_20190904181558" style="zoom: 33%;" />
-
-3. 小说详情页
-
-   <img src="https://s3.ax1x.com/2020/12/04/DbsklV.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
-
-4. 小说阅读页
-
-   <img src="https://s3.ax1x.com/2020/12/04/Dbsew4.jpg" alt="QQ图片20191018161901" style="zoom:33%;" />
-
-#### 爬虫管理系统截图
-
-![img](https://s1.ax1x.com/2020/11/03/BsOgbD.png)
-
-![img](https://s1.ax1x.com/2020/11/03/BsOHr8.png)
-
-#### 后台管理系统截图
-
-![img](https://oscimg.oschina.net/oscnet/up-0552343538674a22a64819834100558f39b.png)
-
-![img](https://s3.ax1x.com/2020/12/01/DWgLNT.png)
-
-![img](https://s3.ax1x.com/2020/12/01/DfmRCd.png)
-
-![img](https://oscimg.oschina.net/oscnet/up-faf5dda7320674c29a1772bc0c81d74762e.png)
-
-#### 安装步骤
-
-##### 数据库安装：
-
-1. 安装MySQL软件。
-2. 修改MySQL`max_allowed_packet `配置（建议100M）。
-3. 新建数据库，设置编码为utf8mb4。
-4. 执行sql/novel_plus.sql脚本文件。
-
-##### 爬虫管理系统安装：
-
-1.  修改novel-common模块下application-dev.yml文件中的数据库的配置。
-2. 修改novel-crawl模块下application.yml文件中的管理员账号密码。
-3. 启动程序，打开浏览器，默认8081端口访问。
-4. 选择已有或新增爬虫源（支持自定义爬虫规则），点击`开启`按钮，开始爬取小说数据。
-
-##### 前台小说门户安装：
-
-1. 修改novel-common模块下application-dev.yml文件中的数据库的配置。
-2. 启动程序，打开浏览器，默认8080端口访问。
-
-**喜欢此项目的可以给我的GitHub和Gitee加个Star支持一下 。**
-
-#### 其他安装教程
-
-包安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4272630) 
-
-宝塔安装教程（非官方）：[点击前往](https://www.daniao.org/9166.html) 
-
-docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
-
-#### 代码仓库
-
- GitHub仓库地址： https://github.com/201206030/novel-plus 
- 
- Gitee仓库地址： https://gitee.com/novel_dev_team/novel-plus
-
-#### QQ交流群
-
-![mini-code](https://s1.ax1x.com/2020/10/31/BUQVeI.png)
-
-#### 微信公众号（发布最新更新资讯）
-
-![mini-code](https://s3.ax1x.com/2020/12/03/DoImOx.png)
-
-#### 赞赏支持
 
 开源项目不易，若此项目能得到你的青睐，那么你可以赞赏支持作者持续开发与维护。
 
 - 服务器的费用也是一笔开销
-- 为用户提供更好的开发环境
+- 编写更完备的文档教程
+- 发布更多前端模版和爬虫规则
 - 一杯咖啡
 
-![mini-code](https://s1.ax1x.com/2020/10/31/BUQJwq.png)
+![](https://s1.ax1x.com/2020/10/31/BUQJwq.png)
 
-### 免责声明
+## 免责声明
 
-本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。
+本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
-用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
 
-### 备注
 
-精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
-
-[![index](https://s1.ax1x.com/2020/07/03/NOSuMF.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )

config/shardingsphere-jdbc.yml

@@ -0,0 +1,53 @@
+mode:
+  # 单机模式
+  type: Standalone
+  # 元数据持久化
+  repository:
+    # 数据库持久化
+    type: JDBC
+
+# 数据源配置
+dataSources:
+  ds_1:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    jdbcUrl: jdbc:mysql://localhost:3306/novel_plus?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+  ds_2:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/information_schema?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+# 规则配置
+rules:
+  - !SINGLE
+    tables:
+      - "*.*"
+  - !SHARDING
+    tables: # 数据分片规则配置
+      book_content:
+        # 分库策略，缺省表示使用默认分库策略
+        actualDataNodes: ds_${1}.book_content${0..9}
+        # 分表策略
+        tableStrategy:
+          standard:
+            # 分片列名称
+            shardingColumn: index_id
+            # 分片算法名称
+            shardingAlgorithmName: bookContentSharding
+
+    shardingAlgorithms:
+      bookContentSharding:
+        # 行表达式分片算法，使用 Groovy 的表达式，提供对 SQL 语句中的 = 和 IN 的分片操作支持
+        type: INLINE
+        props:
+          # 分片算法的行表达式
+          algorithm-expression: book_content${index_id % 10}
+
+
+
+props:
+  # 是否在日志中打印 SQL
+  sql-show: true

doc/api.md

@@ -1,116 +0,0 @@
-
- <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/20210726.sql

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

doc/sql/20210913.sql

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

doc/sql/20230413.sql

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

doc/sql/20230418.sql

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

doc/sql/20230508.sql

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

doc/sql/20240512.sql

@@ -0,0 +1,3 @@
+update crawl_source
+set crawl_rule = replace(crawl_rule, 'ibiquge.net', 'ibiquzw.org')
+where id = 16;

doc/sql/20250317.sql

@@ -0,0 +1,44 @@
+INSERT INTO crawl_source (source_name, crawl_rule, source_status, create_time, update_time)
+VALUES ('香书小说网', '{
+  "bookListUrl": "http://www.xbiqugu.la/fenlei/{catId}_{page}.html",
+  "catIdRule": {
+    "catId1": "1",
+    "catId2": "2",
+    "catId3": "3",
+    "catId4": "4",
+    "catId5": "6",
+    "catId6": "5"
+  },
+  "bookIdPatten": "<a\\\\s+href=\\"http://www.xbiqugu.la/(\\\\d+/\\\\d+)/\\"\\\\s+target=\\"_blank\\">",
+  "pagePatten": "<em\\\\s+id=\\"pagestats\\">(\\\\d+)/\\\\d+</em>",
+  "totalPagePatten": "<em\\\\s+id=\\"pagestats\\">\\\\d+/(\\\\d+)</em>",
+  "bookDetailUrl": "http://www.xbiqugu.la/{bookId}/",
+  "bookNamePatten": "<h1>([^/]+)</h1>",
+  "authorNamePatten": "者：([^/]+)</p>",
+  "picUrlPatten": "src=\\"(http://www.xbiqugu.la/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\"",
+  "bookStatusRule": {},
+  "descStart": "<div id=\\"intro\\">",
+  "descEnd": "</div>",
+  "upadateTimePatten": "<p>最后更新：(\\\\d+-\\\\d+-\\\\d+\\\\s\\\\d+:\\\\d+:\\\\d+)</p>",
+  "upadateTimeFormatPatten": "yyyy-MM-dd HH:mm:ss",
+  "bookIndexUrl": "http://www.xbiqugu.la/{bookId}/",
+  "indexIdPatten": "<a\\\\s+href=''/\\\\d+/\\\\d+/(\\\\d+)\\\\.html''\\\\s+>[^/]+</a>",
+  "indexNamePatten": "<a\\\\s+href=''/\\\\d+/\\\\d+/\\\\d+\\\\.html''\\\\s+>([^/]+)</a>",
+  "bookContentUrl": "http://www.xbiqugu.la/{bookId}/{indexId}.html",
+  "contentStart": "<div id=\\"content\\">",
+  "contentEnd": "<p>",
+  "filterContent":"<div\\\\s+id=\\"content_tip\\">\\\\s*<b>([^/]+)</b>\\\\s*</div>"
+}', 0, '2024-06-01 10:11:39', '2024-06-01 10:11:39');
+
+
+update crawl_source
+set crawl_rule = replace(crawl_rule, 'ibiquzw.org', 'biquxs.info')
+where id = 16;
+
+delete
+from sys_menu
+where menu_id = 104;
+
+delete
+from sys_menu
+where menu_id = 57;

doc/sql/20250630.sql

@@ -0,0 +1,3 @@
+alter table book_comment add column location varchar(50) DEFAULT NULL COMMENT '地理位置' after comment_content ;
+
+

doc/sql/Dockerfile

@@ -0,0 +1,2 @@
+FROM mysql:8.0
+COPY novel_plus.sql /docker-entrypoint-initdb.d/init.sql

doc/sql/readme.md

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

novel-admin/Dockerfile

@@ -1,6 +0,0 @@
-FROM java:8
-ADD novel-admin-1.0.0.jar /root
-ENV dburl=""
-ENV username=""
-ENV	password=""
-ENTRYPOINT ["sh","-c","java -Dspring.datasource.url=${dburl} -Dspring.datasource.username=${username} -Dspring.datasource.password=${password} -jar /root/novel-admin-1.0.0.jar"]

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>3.1.0</version>
+    <version>5.1.5</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>
@@ -14,16 +14,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.1.RELEASE</version>
+        <version>2.7.18</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <java.version>21</java.version>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
         <velocity.version>1.7</velocity.version>
-        <activiti.version>5.22.0</activiti.version>
+        <shardingsphere-jdbc.version>5.5.1</shardingsphere-jdbc.version>
     </properties>
 
     <dependencies>
@@ -58,16 +56,16 @@
             <groupId>net.sourceforge.nekohtml</groupId>
             <artifactId>nekohtml</artifactId>
         </dependency>
+        <!-- 请求参数校验相关 -->
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
         <!--mybatis -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.11</version>
+            <version>8.0.29</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis</artifactId>
-            <version>3.4.4</version>
         </dependency>
 
         <dependency>
@@ -75,18 +73,7 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.1.1</version>
         </dependency>
-        <!--druid -->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>1.0.28</version>
-        </dependency>
         <!--commons -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
-        </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
@@ -95,18 +82,18 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
+            <version>2.9.0</version>
         </dependency>
         <!--shiro -->
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
-            <version>1.3.2</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring</artifactId>
-            <version>1.3.2</version>
+            <version>1.11.0</version>
         </dependency>
         <!-- shiro ehcache -->
         <dependency>
@@ -118,7 +105,7 @@
                     <artifactId>ehcache-core</artifactId>
                 </exclusion>
             </exclusions>
-            <version>1.4.0</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.github.theborakompanioni</groupId>
@@ -129,13 +116,19 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.31</version>
+            <version>1.2.83</version>
         </dependency>
         <!--velocity代码生成使用模板 -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
             <version>1.7</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-lang</artifactId>
+                    <groupId>commons-lang</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--<dependency>-->
         <!--<groupId>org.springframework.boot</groupId>-->
@@ -164,6 +157,12 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>2.6.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.springfox</groupId>
@@ -193,16 +192,29 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
             <version>1.4</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-lang3</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
-        <!-- ehchache -->
+        <!-- ShardingSphere-JDBC -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
+            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
+            <artifactId>shardingsphere-jdbc</artifactId>
+            <version>${shardingsphere-jdbc.version}</version>
         </dependency>
         <dependency>
-            <groupId>net.sf.ehcache</groupId>
+            <groupId>org.yaml</groupId>
-            <artifactId>ehcache</artifactId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <!--war包部署需要-->
@@ -224,41 +236,131 @@
         <!--<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>
+
+                                <copy file="${basedir}/src/main/build/docker/Dockerfile"
+                                      tofile="${project.build.directory}/build/Dockerfile"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-    <!--<distributionManagement>
+    <repositories>
         <repository>
-            <id>nexus_release</id>
+            <id>ali</id>
-            <name>release</name>
+            <url>https://maven.aliyun.com/repository/public</url>
-            <url>http://47.106.243.172:8081/nexus/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
-        <snapshotRepository>
+    </repositories>
-            <id>nexus_snapshots</id>
+    <pluginRepositories>
-            <name>snapshots</name>
+        <pluginRepository>
-            <url>http://47.106.243.172:8081/nexus/content/repositories/snapshots/</url>
+            <id>ali-plugin</id>
-        </snapshotRepository>
+            <url>https://maven.aliyun.com/repository/public</url>
-    </distributionManagement>-->
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <profiles>
+        <profile>
+            <!-- 定义一个用于切换到中央仓库的profile -->
+            <id>central-repo</id>
+            <repositories>
+                <repository>
+                    <id>central</id>
+                    <url>https://repo.maven.apache.org/maven2/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <id>central-plugin</id>
+                    <url>https://repo.maven.apache.org/maven2/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
 </project>

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

@@ -0,0 +1,9 @@
+#端口号
+server:
+  port: 8088
+spring:
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password: test123456
+

novel-admin/src/main/build/config/shardingsphere-jdbc.yml

@@ -0,0 +1,47 @@
+mode:
+  # 单机模式
+  type: Standalone
+  # 元数据持久化
+  repository:
+    # 数据库持久化
+    type: JDBC
+
+# 数据源配置
+dataSources:
+  ds_1:
+    dataSourceClassName: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    jdbcUrl: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+# 规则配置
+rules:
+  - !SINGLE
+    tables:
+      - "*.*"
+  - !SHARDING
+    tables: # 数据分片规则配置
+      book_content:
+        # 分库策略，缺省表示使用默认分库策略
+        actualDataNodes: ds_${1}.book_content${0..9}
+        # 分表策略
+        tableStrategy:
+          standard:
+            # 分片列名称
+            shardingColumn: index_id
+            # 分片算法名称
+            shardingAlgorithmName: bookContentSharding
+
+    shardingAlgorithms:
+      bookContentSharding:
+        # 行表达式分片算法，使用 Groovy 的表达式，提供对 SQL 语句中的 = 和 IN 的分片操作支持
+        type: INLINE
+        props:
+          # 分片算法的行表达式
+          algorithm-expression: book_content${index_id % 10}
+
+
+
+props:
+  # 是否在日志中打印 SQL
+  sql-show: true

novel-admin/src/main/build/docker/Dockerfile

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

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,47 @@
 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的功能
+import javax.sql.DataSource;
-@EnableAutoConfiguration(exclude = {
+import java.net.InetAddress;
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+import java.sql.Connection;
-})
+
+
 @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, DataSource dataSource) {
+        return args -> {
+            log.info("创建连接池...");
+            try (Connection connection = dataSource.getConnection()) {
+                log.info("连接池已创建.");
+                log.info("数据库：{}", connection.getMetaData().getDatabaseProductName());
+                log.info("数据库版本：{}", connection.getMetaData().getDatabaseProductVersion());
+            }
+            log.info("项目启动啦，访问路径：{}",
+                "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + ctx.getEnvironment()
+                    .getProperty("server.port"));
+        };
+    }
 }

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

@@ -1,19 +1,16 @@
 package com.java2nb.common.aspect;
 
-import com.java2nb.common.utils.HttpContextUtils;
+import com.java2nb.common.utils.IPUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.*;
-import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import sun.net.util.IPAddressUtil;
 
 import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Method;
 import java.util.Arrays;
 
 @Aspect
@@ -37,11 +34,10 @@ public class WebLogAspect {
         logger.info("请求地址 : " + request.getRequestURL().toString());
         logger.info("HTTP METHOD : " + request.getMethod());
         // 获取真实的ip地址
-        //logger.info("IP : " + IPAddressUtil.getClientIpAddress(request));
+        logger.info("IP : " + IPUtils.getIpAddr(request));
         logger.info("CLASS_METHOD : " + joinPoint.getSignature().getDeclaringTypeName() + "."
-                + joinPoint.getSignature().getName());
+            + joinPoint.getSignature().getName());
         logger.info("参数 : " + Arrays.toString(joinPoint.getArgs()));
-//        loggger.info("参数 : " + joinPoint.getArgs());
 
     }
 

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/DruidDBConfig.java

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

novel-admin/src/main/java/com/java2nb/common/config/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,17 @@ public class ShiroConfig {
         shiroFilterFactoryBean.setSuccessUrl("/index");
         shiroFilterFactoryBean.setUnauthorizedUrl("/403");
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
-        filterChainDefinitionMap.put("/login","anon");
+        filterChainDefinitionMap.put("/login", "anon");
-        filterChainDefinitionMap.put("/getVerify","anon");
+        filterChainDefinitionMap.put("/getVerify", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/fonts/**", "anon");
         filterChainDefinitionMap.put("/img/**", "anon");
+        filterChainDefinitionMap.put("/favicon.ico", "anon");
         filterChainDefinitionMap.put("/docs/**", "anon");
         filterChainDefinitionMap.put("/layuimini/**", "anon");
-        filterChainDefinitionMap.put("/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 +88,7 @@ public class ShiroConfig {
         //设置realm.
         securityManager.setRealm(userRealm());
         // 自定义缓存实现 使用redis
-        if (Constant.CACHE_TYPE_REDIS.equals(cacheType)) {
+        securityManager.setCacheManager(rediscacheManager());
-            securityManager.setCacheManager(rediscacheManager());
-        } else {
-            securityManager.setCacheManager(ehCacheManager());
-        }
         securityManager.setSessionManager(sessionManager());
         return securityManager;
     }
@@ -109,8 +100,7 @@ public class ShiroConfig {
     }
 
     /**
-     * 开启shiro aop注解支持.
+     * 开启shiro aop注解支持. 使用代理方式;所以需要开启代码支持;
-     * 使用代理方式;所以需要开启代码支持;
      *
      * @param securityManager
      * @return
@@ -139,8 +129,7 @@ public class ShiroConfig {
     }
 
     /**
-     * cacheManager 缓存 redis实现
+     * cacheManager 缓存 redis实现 使用的是shiro-redis开源插件
-     * 使用的是shiro-redis开源插件
      *
      * @return
      */
@@ -152,8 +141,7 @@ public class ShiroConfig {
 
 
     /**
-     * RedisSessionDAO shiro sessionDao层的实现 通过redis
+     * RedisSessionDAO shiro sessionDao层的实现 通过redis 使用的是shiro-redis开源插件
-     * 使用的是shiro-redis开源插件
      */
     @Bean
     public RedisSessionDAO redisSessionDAO() {
@@ -164,11 +152,7 @@ public class ShiroConfig {
 
     @Bean
     public SessionDAO sessionDAO() {
-        if (Constant.CACHE_TYPE_REDIS.equals(cacheType)) {
+        return redisSessionDAO();
-            return redisSessionDAO();
-        } else {
-            return new MemorySessionDAO();
-        }
     }
 
     /**
@@ -185,19 +169,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/Swagger2Config.java

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

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

@@ -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) {
+    @Override
-		registry.addResourceHandler("/files/**").addResourceLocations("file:///"+ jnConfig.getUploadPath());
+    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;
@@ -32,165 +34,167 @@ import java.util.Map;
 @RequestMapping("/common/sysFile")
 public class FileController extends BaseController {
 
-	@Autowired
+    @Autowired
-	private FileService sysFileService;
+    private FileService sysFileService;
 
-	@Autowired
+    @Autowired
-	private JnConfig jnConfig;
+    private JnConfig jnConfig;
 
-	@GetMapping()
+    @GetMapping()
-	@RequiresPermissions("common:sysFile:sysFile")
+    @RequiresPermissions("common:sysFile:sysFile")
-	String sysFile(Model model) {
+    String sysFile(Model model) {
-		Map<String, Object> params = new HashMap<>(16);
+        Map<String, Object> params = new HashMap<>(16);
-		return "common/file/file";
+        return "common/file/file";
-	}
+    }
 
-	@ResponseBody
+    @ResponseBody
-	@GetMapping("/list")
+    @GetMapping("/list")
-	@RequiresPermissions("common:sysFile:sysFile")
+    @RequiresPermissions("common:sysFile:sysFile")
-	public PageBean list(@RequestParam Map<String, Object> params) {
+    public PageBean list(@RequestParam Map<String, Object> params) {
-		// 查询列表数据
+        // 查询列表数据
-		Query query = new Query(params);
+        Query query = new Query(params);
-		List<FileDO> sysFileList = sysFileService.list(query);
+        List<FileDO> sysFileList = sysFileService.list(query);
-		int total = sysFileService.count(query);
+        int total = sysFileService.count(query);
-		PageBean pageBean = new PageBean(sysFileList, total);
+        PageBean pageBean = new PageBean(sysFileList, total);
-		return pageBean;
+        return pageBean;
-	}
+    }
 
-	@GetMapping("/add")
+    @GetMapping("/add")
-	// @RequiresPermissions("common:bComments")
+        // @RequiresPermissions("common:bComments")
-	String add() {
+    String add() {
-		return "common/sysFile/add";
+        return "common/sysFile/add";
-	}
+    }
 
-	@GetMapping("/edit")
+    @GetMapping("/edit")
-	// @RequiresPermissions("common:bComments")
+        // @RequiresPermissions("common:bComments")
-	String edit(Long id, Model model) {
+    String edit(Long id, Model model) {
-		FileDO sysFile = sysFileService.get(id);
+        FileDO sysFile = sysFileService.get(id);
-		model.addAttribute("sysFile", sysFile);
+        model.addAttribute("sysFile", sysFile);
-		return "common/sysFile/edit";
+        return "common/sysFile/edit";
-	}
+    }
 
-	/**
+    /**
-	 * 信息
+     * 信息
-	 */
+     */
-	@RequestMapping("/info/{id}")
+    @RequestMapping("/info/{id}")
-	@RequiresPermissions("common:info")
+    @RequiresPermissions("common:info")
-	public R info(@PathVariable("id") Long id) {
+    public R info(@PathVariable("id") Long id) {
-		FileDO sysFile = sysFileService.get(id);
+        FileDO sysFile = sysFileService.get(id);
-		return R.ok().put("sysFile", sysFile);
+        return R.ok().put("sysFile", sysFile);
-	}
+    }
 
-	/**
+    /**
-	 * 保存
+     * 保存
-	 */
+     */
-	@ResponseBody
+    @ResponseBody
-	@PostMapping("/save")
+    @PostMapping("/save")
-	@RequiresPermissions("common:save")
+    @RequiresPermissions("common:save")
-	public R save(FileDO sysFile) {
+    public R save(FileDO sysFile) {
-		if (sysFileService.save(sysFile) > 0) {
+        if (sysFileService.save(sysFile) > 0) {
-			return R.ok();
+            return R.ok();
-		}
+        }
-		return R.error();
+        return R.error();
-	}
+    }
 
-	/**
+    /**
-	 * 修改
+     * 修改
-	 */
+     */
-	@RequestMapping("/update")
+    @RequestMapping("/update")
-	@RequiresPermissions("common:update")
+    @RequiresPermissions("common:update")
-	public R update(@RequestBody FileDO sysFile) {
+    public R update(@RequestBody FileDO sysFile) {
-		sysFileService.update(sysFile);
+        sysFileService.update(sysFile);
 
-		return R.ok();
+        return R.ok();
-	}
+    }
 
-	/**
+    /**
-	 * 删除
+     * 删除
-	 */
+     */
-	@PostMapping("/remove")
+    @PostMapping("/remove")
-	@ResponseBody
+    @ResponseBody
-	// @RequiresPermissions("common:remove")
+    // @RequiresPermissions("common:remove")
-	public R remove(Long id, HttpServletRequest request) {
+    public R remove(Long id, HttpServletRequest request) {
-		if ("test".equals(getUsername())) {
+        if ("test".equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
+        }
-		String fileName = jnConfig.getUploadPath() + sysFileService.get(id).getUrl().replace("/files/", "");
+        String fileName =
-		if (sysFileService.remove(id) > 0) {
+            jnConfig.getUploadPath() + sysFileService.get(id).getUrl().replace(Constant.UPLOAD_FILES_PREFIX, "");
-			boolean b = FileUtil.deleteFile(fileName);
+        if (sysFileService.remove(id) > 0) {
-			if (!b) {
+            boolean b = FileUtil.deleteFile(fileName);
-				return R.error("数据库记录删除成功，文件删除失败");
+            if (!b) {
-			}
+                return R.error("数据库记录删除成功，文件删除失败");
-			return R.ok();
+            }
-		} else {
+            return R.ok();
-			return R.error();
+        } else {
-		}
+            return R.error();
-	}
+        }
+    }
 
-	/**
+    /**
-	 * 删除
+     * 删除
-	 */
+     */
-	@PostMapping("/batchRemove")
+    @PostMapping("/batchRemove")
-	@ResponseBody
+    @ResponseBody
-	@RequiresPermissions("common:remove")
+    @RequiresPermissions("common:remove")
-	public R remove(@RequestParam("ids[]") Long[] ids) {
+    public R remove(@RequestParam("ids[]") Long[] ids) {
-		if ("test".equals(getUsername())) {
+        if ("test".equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
+        }
-		sysFileService.batchRemove(ids);
+        sysFileService.batchRemove(ids);
-		return R.ok();
+        return R.ok();
-	}
+    }
 
-	@ResponseBody
+    @ResponseBody
-	@PostMapping("/upload")
+    @PostMapping("/upload")
-	R upload(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
+    R upload(@RequestParam("file") MultipartFile file, HttpServletRequest request) {
-		if ("test".equals(getUsername())) {
+        if ("test".equals(getUsername())) {
-			return R.error(1, "演示系统不允许修改,完整体验请部署程序");
+            return R.error(1, "演示系统不允许修改,完整体验请部署程序");
-		}
+        }
-		Date date = new Date();
+        Date date = new Date();
-		String year = DateUtils.format(date,DateUtils.YEAR_PATTERN);
+        String year = DateUtils.format(date, DateUtils.YEAR_PATTERN);
-		String month = DateUtils.format(date,DateUtils.MONTH_PATTERN);
+        String month = DateUtils.format(date, DateUtils.MONTH_PATTERN);
-		String day = DateUtils.format(date,DateUtils.DAY_PATTERN);
+        String day = DateUtils.format(date, DateUtils.DAY_PATTERN);
 
-		String fileName = file.getOriginalFilename();
+        String fileName = file.getOriginalFilename();
-		String fileDir = year+"/"+month+"/"+day + "/";
+        String fileDir = year + "/" + month + "/" + day + "/";
-		fileName = FileUtil.renameToUUID(fileName);
+        fileName = FileUtil.renameToUUID(fileName);
-		FileDO sysFile = new FileDO(FileType.fileType(fileName), "/files/" + fileDir + fileName, date);
+        FileDO sysFile = new FileDO(FileType.fileType(fileName), Constant.UPLOAD_FILES_PREFIX + fileDir + fileName,
-		try {
+            date);
-			FileUtil.uploadFile(file.getBytes(), jnConfig.getUploadPath()+fileDir, fileName);
+        try {
-		} catch (Exception e) {
+            FileUtil.uploadFile(file.getBytes(), jnConfig.getUploadPath() + fileDir, fileName);
-			return R.error();
+        } catch (Exception e) {
-		}
+            return R.error();
+        }
 
-		if (sysFileService.save(sysFile) > 0) {
+        if (sysFileService.save(sysFile) > 0) {
-			return R.ok().put("fileName",sysFile.getUrl());
+            return R.ok().put("fileName", sysFile.getUrl());
-		}
+        }
-		return R.error();
+        return R.error();
-	}
+    }
 
-	/**
+    /**
-	 * 文件下载
+     * 文件下载
-	 */
+     */
-	@RequestMapping(value = "/download")
+    @RequestMapping(value = "/download")
-	public void fileDownload(String filePath,String fileName, HttpServletResponse resp) throws Exception {
+    public void fileDownload(String filePath, String fileName, HttpServletResponse resp) throws Exception {
-			String realFilePath = jnConfig.getUploadPath() + filePath;
+        String realFilePath = jnConfig.getUploadPath() + filePath;
-			InputStream in = new FileInputStream(realFilePath);
+        InputStream in = new FileInputStream(realFilePath);
-			//设置响应头，对文件进行url编码
+        //设置响应头，对文件进行url编码
-			fileName = URLEncoder.encode(fileName, "UTF-8");
+        fileName = URLEncoder.encode(fileName, "UTF-8");
-			resp.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+        resp.setHeader("Content-Disposition", "attachment;filename=" + fileName);
 
-			resp.setContentLength(in.available());
+        resp.setContentLength(in.available());
 
-			OutputStream out = resp.getOutputStream();
+        OutputStream out = resp.getOutputStream();
-			byte[] b = new byte[1024];
+        byte[] b = new byte[1024];
-			int len = 0;
+        int len = 0;
-			while ((len = in.read(b)) != -1) {
+        while ((len = in.read(b)) != -1) {
-				out.write(b, 0, len);
+            out.write(b, 0, len);
-			}
+        }
-			out.flush();
+        out.flush();
-			out.close();
+        out.close();
-			in.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())")
+    @Select(
-	int count(Map<String, Object> map);
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from 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"
+    @Select("select count(*) from tables where table_schema = 'novel_plus'")
-			+ "	where table_schema = (select database()) and table_name = #{tableName}")
+    int count(Map<String, Object> map);
-	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"
+    @Select(
-			+ " where table_name = #{tableName} and table_schema = (select database()) order by ordinal_position")
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from tables \r\n"
-	List<Map<String, String>> listColumns(String tableName);
+            + "	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"
+    @Select(
-			+ " where table_name = #{tableName} and table_schema = (select database()) and column_key = 'PRI' limit 1")
+        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from 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 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,7 +3,7 @@ package com.java2nb.common.domain;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
-
+import java.util.Objects;
 
 
 /**
@@ -14,208 +14,259 @@ import java.util.Date;
  * @date 2019-09-29 18:28:07
  */
 public class DictDO implements Serializable {
-	private static final long serialVersionUID = 1L;
 
-	//编号
+    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;
 
-	/**
+    //编号
-	 * 设置：编号
+    private Long id;
-	 */
+    //标签名
-	public void setId(Long id) {
+    private String name;
-		this.id = id;
+    //数据值
-	}
+    private String value;
-	/**
+    //类型
-	 * 获取：编号
+    private String type;
-	 */
+    //描述
-	public Long getId() {
+    private String description;
-		return id;
+    //排序（升序）
-	}
+    private BigDecimal sort;
-	/**
+    //父级编号
-	 * 设置：标签名
+    private Long parentId;
-	 */
+    //创建者
-	public void setName(String name) {
+    private Integer createBy;
-		this.name = name;
+    //创建时间
-	}
+    private Date createDate;
-	/**
+    //更新者
-	 * 获取：标签名
+    private Long updateBy;
-	 */
+    //更新时间
-	public String getName() {
+    private Date updateDate;
-		return name;
+    //备注信息
-	}
+    private String remarks;
-	/**
+    //删除标记
-	 * 设置：数据值
+    private String delFlag;
-	 */
-	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 +
+    public void setId(Long id) {
-				", name='" + name + '\'' +
+        this.id = id;
-				", value='" + value + '\'' +
+    }
-				", type='" + type + '\'' +
+
-				", description='" + description + '\'' +
+    /**
-				", sort=" + sort +
+     * 获取：编号
-				", parentId=" + parentId +
+     */
-				", createBy=" + createBy +
+    public Long getId() {
-				", createDate=" + createDate +
+        return id;
-				", updateBy=" + updateBy +
+    }
-				", updateDate=" + updateDate +
+
-				", remarks='" + remarks + '\'' +
+    /**
-				", delFlag='" + delFlag + '\'' +
+     * 设置：标签名
-				'}';
+     */
-	}
+    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);
+    }
 }