style: 代码格式化

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

README.md

@@ -1,11 +1,12 @@
-[![index]( https://youdoc.github.io/img/tencent.jpg )]( https://cloud.tencent.com/act/cps/redirect?redirect=2446&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console )
+<p align="center">
-
+    <a href="https://www.swiftproxy.net/?code=T2WV1VT50"><img src="https://xxyopen.com/images/ad1.png" alt="AD" ></a>
+    <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>
-    <a href="https://github.com/201206030/novel-plus"><img src="https://visitor-badge.glitch.me/badge?page_id=201206030.novel-plus" alt="visitors"></a>
 </p>
 
 <p align="center">
@@ -16,7 +17,7 @@
 
 novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
 系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
-TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、会员充值、订阅模式、新闻发布和实时统计报表。
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、AI写作、会员充值、订阅模式、新闻发布和实时统计报表。
 
 ## 项目地址
 
@@ -39,8 +40,9 @@ novel-plus -- 父工程
 ## 技术选型
 
 | 技术                  | 说明                  
-|---------------------| ---------------------------
+|---------------------|---------------------
 | Spring Boot         | Spring 应用快速开发脚手架    
+| Spring AI           | Spring 官方 AI 框架     
 | MyBatis             | 持久层 ORM 框架          
 | MyBatis Dynamic SQL | Mybatis 动态 sql      
 | PageHelper          | MyBatis 分页插件        
@@ -50,17 +52,60 @@ novel-plus -- 父工程
 | Spring Security     | 安全框架                
 | Apache Shiro        | 安全框架                
 | Redis               | 缓存方案                
-| Aliyun OSS          | 阿里云对象存储服务(图片存储方式之一，一行配置即可切换)
+| Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案） 
-| FastDFS             | 开源轻量级分布式文件系统(图片存储方式之一，一行配置即可切换)
 | Lombok              | 简化对象封装工具            
 | Docker              | 应用容器引擎              
 | MySQL               | 数据库服务               
 | Thymeleaf           | 模板引擎                
 | Layui               | 前端 UI 框架            
 
-## 项目演示
+## 项目截图
 
-https://www.bilibili.com/video/BV1Zo4y187Mi
+### 绿色主题模版
+
+[![点击查看大图](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)
+
+## 演示视频
+
+https://www.bilibili.com/video/BV18e41197xs
+
+## AI 功能
+
+novel-plus 5.x 已集成 Spring 官方最新发布的 Spring AI 框架，并推出多项 AI 功能：
+
+1. v5.0.0 版本在小说章节发布页面的文本编辑器中集成了多项智能编辑功能，包括 AI 扩写、缩写、续写及文本润色等。这些功能的设计灵感来源于百家号文章编辑器中的 AI 助手。
+2. v5.1.0 版本在小说发布页面，新增 AI 生成封面图功能。若作家未上传自定义封面图，系统将根据小说信息自动生成封面图。
+
+目前，AI 功能仍处于实验阶段，仅实现了基础的核心功能。我们非常重视用户的实际使用体验和反馈，未来将根据用户需求和使用情况，持续优化和调整该功能。如果用户反馈积极，我们计划进一步开发更高级的
+AI 功能，例如自动生成有声小说、智能情节推荐等，以全面提升 novel-plus 的创作能力和用户体验。
+
+我们将持续关注 AI 技术的发展，并致力于将其与小说创作场景深度融合，为用户带来更智能、更便捷的创作工具。
+
+由于 DeepSeek 官方 API 目前不可用，novel-plus 项目默认使用的是第三方[硅基流动](https://cloud.siliconflow.cn/i/DOgMRH9S)
+提供的 API，采用的 AI 模型有对话模型`deepseek-ai/DeepSeek-R1-Distill-Llama-8B`（DeepSeek-R1 的蒸馏版本，免费使用）和生图模型`Kwai-Kolors/Kolors`（快手 Kolors 团队开发的文本到图像生成模型，免费使用）。只需注册一个硅基流动账号，创建一个
+API 密钥，并将其添加到 novel-plus 项目 novel-front 模块的 yaml 配置文件中，即可体验 novel-plus 项目的 AI 写作功能。
+
+```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
+```
+
+> ⚠️ novel-plus 项目默认使用的都是免费 AI 模型，生成效果有限。如果对生成内容有更高的要求，建议选用付费的 AI 模型。
 
 ## 增值服务
 
@@ -86,3 +131,5 @@ https://www.bilibili.com/video/BV1Zo4y187Mi
 ## 免责声明
 
 本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
+
+

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/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/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/Dockerfile

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

doc/sql/novel_plus.sql

@@ -1,20 +1,7 @@
-/*
+CREATE database if NOT EXISTS `novel_plus` default character set utf8mb4 collate utf8mb4_unicode_ci;
-Navicat MySQL Data Transfer
+use `novel_plus`;
 
-Source Server         : localhost
+SET NAMES utf8mb4;
-Source Server Version : 50725
-Source Host           : localhost:3306
-Source Database       : novel_plus
-
-Target Server Type    : MYSQL
-Target Server Version : 50725
-File Encoding         : 65001
-
-Date: 2020-05-18 13:59:04
-*/
-
-SET
-FOREIGN_KEY_CHECKS=0;
 
 -- ----------------------------
 -- Table structure for author
@@ -33,7 +20,9 @@ CREATE TABLE `author`
     `status`         tinyint(4)  DEFAULT '0' COMMENT '0：正常，1：封禁',
     `create_time`    datetime    DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='作者表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 3
+  DEFAULT CHARSET = utf8mb4 COMMENT ='作者表';
 
 -- ----------------------------
 -- Records of author
@@ -58,7 +47,9 @@ CREATE TABLE `author_code`
     `create_user_id` bigint(20)   DEFAULT NULL COMMENT '创建人ID',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_code` (`invite_code`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COMMENT='作家邀请码表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 6
+  DEFAULT CHARSET = utf8mb4 COMMENT ='作家邀请码表';
 
 -- ----------------------------
 -- Records of author_code
@@ -102,10 +93,12 @@ CREATE TABLE `book`
     `crawl_last_time`        datetime               DEFAULT NULL COMMENT '最后一次的抓取时间',
     `crawl_is_stop`          tinyint(1)             DEFAULT '0' COMMENT '是否已停止更新，0：未停止，1：已停止',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `key_uq_bookName_authorName` (`book_name`,`author_name`) USING BTREE,
+    UNIQUE KEY `key_uq_bookName_authorName` (`book_name`, `author_name`) USING BTREE,
     KEY `key_lastIndexUpdateTime` (`last_index_update_time`) USING BTREE,
     KEY `key_createTime` (`create_time`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1262260513468559361 DEFAULT CHARSET=utf8mb4 COMMENT='小说表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1262260513468559361
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说表';
 
 -- ----------------------------
 -- Records of book
@@ -130,7 +123,9 @@ CREATE TABLE `book_author`
     `update_time`    datetime    DEFAULT NULL COMMENT '更新时间',
     `update_user_id` bigint(20)  DEFAULT NULL COMMENT '更新人ID',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1254957873655066625 DEFAULT CHARSET=utf8mb4 COMMENT='作者表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1254957873655066625
+  DEFAULT CHARSET = utf8mb4 COMMENT ='作者表';
 
 -- ----------------------------
 -- Records of book_author
@@ -151,7 +146,9 @@ CREATE TABLE `book_category`
     `update_user_id` bigint(20)           DEFAULT NULL,
     `update_time`    datetime             DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='小说类别表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 8
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说类别表';
 
 -- ----------------------------
 -- Records of book_category
@@ -185,8 +182,10 @@ CREATE TABLE `book_comment`
     `create_time`     datetime     DEFAULT NULL COMMENT '评价时间',
     `create_user_id`  bigint(20)   DEFAULT NULL COMMENT '评价人',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `key_uq_bookid_userid` (`book_id`,`create_user_id`) USING BTREE
+    UNIQUE KEY `key_uq_bookid_userid` (`book_id`, `create_user_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb4 COMMENT='小说评论表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 13
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说评论表';
 
 -- ----------------------------
 -- Records of book_comment
@@ -209,7 +208,8 @@ CREATE TABLE `book_comment_reply`
     `create_time`    datetime     DEFAULT NULL COMMENT '回复用户ID',
     `create_user_id` bigint(20)   DEFAULT NULL COMMENT '回复时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='小说评论回复表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说评论回复表';
 
 -- ----------------------------
 -- Records of book_comment_reply
@@ -226,7 +226,9 @@ CREATE TABLE `book_content`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=3347665 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 3347665
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Records of book_content
@@ -247,10 +249,12 @@ CREATE TABLE `book_index`
     `create_time` datetime     DEFAULT NULL,
     `update_time` datetime     DEFAULT NULL,
     PRIMARY KEY (`id`),
-    UNIQUE KEY `key_uq_bookId_indexNum` (`book_id`,`index_num`) USING BTREE,
+    UNIQUE KEY `key_uq_bookId_indexNum` (`book_id`, `index_num`) USING BTREE,
     KEY `key_bookId` (`book_id`) USING BTREE,
     KEY `key_indexNum` (`index_num`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1262260612777095169 DEFAULT CHARSET=utf8mb4 COMMENT='小说目录表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1262260612777095169
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说目录表';
 
 -- ----------------------------
 -- Records of book_index
@@ -268,7 +272,9 @@ CREATE TABLE `book_screen_bullet`
     `create_time`   datetime     NOT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`),
     KEY `key_contentId` (`content_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8mb4 COMMENT='小说弹幕表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 79
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说弹幕表';
 
 -- ----------------------------
 -- Records of book_screen_bullet
@@ -289,7 +295,9 @@ CREATE TABLE `book_setting`
     `update_time`    datetime   DEFAULT NULL COMMENT '更新时间',
     `update_user_id` bigint(20) DEFAULT NULL COMMENT '更新人ID',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8mb4 COMMENT='首页小说设置表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 64
+  DEFAULT CHARSET = utf8mb4 COMMENT ='首页小说设置表';
 
 -- ----------------------------
 -- Records of book_setting
@@ -373,7 +381,8 @@ CREATE TABLE `crawl_batch_task`
     `start_time`          datetime   DEFAULT NULL COMMENT '任务开始时间',
     `end_time`            datetime   DEFAULT NULL COMMENT '任务结束时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='批量抓取任务表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='批量抓取任务表';
 
 -- ----------------------------
 -- Records of crawl_batch_task
@@ -392,7 +401,8 @@ CREATE TABLE `crawl_single_task`
     `exc_count`      tinyint(2)   DEFAULT '0' COMMENT '已经执行次数，最多执行5次',
     `create_time`    datetime     DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='抓取单本小说任务表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='抓取单本小说任务表';
 
 -- ----------------------------
 -- Records of crawl_single_task
@@ -411,7 +421,9 @@ CREATE TABLE `crawl_source`
     `create_time`   datetime    DEFAULT NULL COMMENT '创建时间',
     `update_time`   datetime    DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COMMENT='爬虫源表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 5
+  DEFAULT CHARSET = utf8mb4 COMMENT ='爬虫源表';
 
 -- ----------------------------
 -- Records of crawl_source
@@ -449,7 +461,9 @@ CREATE TABLE `friend_link`
     `update_user_id` bigint(20)            DEFAULT NULL COMMENT '更新者用户id',
     `update_time`    datetime              DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 6
+  DEFAULT CHARSET = utf8mb4;
 
 -- ----------------------------
 -- Records of friend_link
@@ -474,7 +488,9 @@ CREATE TABLE `news`
     `update_time`    datetime     DEFAULT NULL COMMENT '更新时间',
     `update_user_id` bigint(20)   DEFAULT NULL COMMENT '更新人ID',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='新闻表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 3
+  DEFAULT CHARSET = utf8mb4 COMMENT ='新闻表';
 
 -- ----------------------------
 -- Records of news
@@ -502,7 +518,9 @@ CREATE TABLE `news_category`
     `update_user_id` bigint(20)           DEFAULT NULL,
     `update_time`    datetime             DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='新闻类别表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 4
+  DEFAULT CHARSET = utf8mb4 COMMENT ='新闻类别表';
 
 -- ----------------------------
 -- Records of news_category
@@ -528,7 +546,9 @@ CREATE TABLE `order_pay`
     `create_time`  datetime            DEFAULT NULL COMMENT '创建时间',
     `update_time`  datetime            DEFAULT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb4 COMMENT='充值订单';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 15
+  DEFAULT CHARSET = utf8mb4 COMMENT ='充值订单';
 
 -- ----------------------------
 -- Records of order_pay
@@ -551,7 +571,9 @@ CREATE TABLE `sys_data_perm`
     `gmt_create`      datetime    DEFAULT NULL COMMENT '创建时间',
     `gmt_modified`    datetime    DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=216 DEFAULT CHARSET=utf8 COMMENT='数据权限管理';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 216
+  DEFAULT CHARSET = utf8 COMMENT ='数据权限管理';
 
 -- ----------------------------
 -- Records of sys_data_perm
@@ -581,7 +603,9 @@ CREATE TABLE `sys_dept`
     `order_num` int(11)     DEFAULT NULL COMMENT '排序',
     `del_flag`  tinyint(4)  DEFAULT '0' COMMENT '是否删除  -1：已删除  0：正常',
     PRIMARY KEY (`dept_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COMMENT='部门管理';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 17
+  DEFAULT CHARSET = utf8 COMMENT ='部门管理';
 
 -- ----------------------------
 -- Records of sys_dept
@@ -618,7 +642,10 @@ CREATE TABLE `sys_dict`
     KEY `sys_dict_value` (`value`),
     KEY `sys_dict_label` (`name`),
     KEY `sys_dict_del_flag` (`del_flag`)
-) ENGINE=InnoDB AUTO_INCREMENT=142 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='字典表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 142
+  DEFAULT CHARSET = utf8
+  COLLATE = utf8_bin COMMENT ='字典表';
 
 -- ----------------------------
 -- Records of sys_dict
@@ -895,7 +922,9 @@ CREATE TABLE `sys_file`
     `url`         varchar(200) DEFAULT NULL COMMENT 'URL地址',
     `create_date` datetime     DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=183 DEFAULT CHARSET=utf8 COMMENT='文件上传';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 183
+  DEFAULT CHARSET = utf8 COMMENT ='文件上传';
 
 -- ----------------------------
 -- Records of sys_file
@@ -1001,7 +1030,9 @@ CREATE TABLE `sys_gen_columns`
     `is_required`    tinyint(1)                       DEFAULT NULL COMMENT '是否必填',
     `dict_type`      varchar(100) CHARACTER SET utf8  DEFAULT '' COMMENT '页面显示为下拉时使用，字典类型从字典表中取出',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=815 DEFAULT CHARSET=utf8mb4;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 815
+  DEFAULT CHARSET = utf8mb4;
 
 -- ----------------------------
 -- Records of sys_gen_columns
@@ -1189,7 +1220,8 @@ CREATE TABLE `sys_gen_table`
     `update_date`          datetime     NOT NULL COMMENT '更新时间',
     `remarks`              varchar(500)          DEFAULT NULL COMMENT '备注信息',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='代码生成表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8 COMMENT ='代码生成表';
 
 -- ----------------------------
 -- Records of sys_gen_table
@@ -1225,7 +1257,8 @@ CREATE TABLE `sys_gen_table_column`
     `options`      varchar(1000)  DEFAULT NULL COMMENT '其它生成选项',
     PRIMARY KEY (`id`),
     KEY `idx_gen_table_column_tn` (`table_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='代码生成表列';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8 COMMENT ='代码生成表列';
 
 -- ----------------------------
 -- Records of sys_gen_table_column
@@ -1247,7 +1280,9 @@ CREATE TABLE `sys_log`
     `ip`         varchar(64)   DEFAULT NULL COMMENT 'IP地址',
     `gmt_create` datetime      DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1412 DEFAULT CHARSET=utf8 COMMENT='系统日志';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1412
+  DEFAULT CHARSET = utf8 COMMENT ='系统日志';
 
 
 -- ----------------------------
@@ -1267,7 +1302,9 @@ CREATE TABLE `sys_menu`
     `gmt_create`   datetime     DEFAULT NULL COMMENT '创建时间',
     `gmt_modified` datetime     DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`menu_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=234 DEFAULT CHARSET=utf8 COMMENT='菜单管理';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 234
+  DEFAULT CHARSET = utf8 COMMENT ='菜单管理';
 
 -- ----------------------------
 -- Records of sys_menu
@@ -1417,7 +1454,9 @@ CREATE TABLE `sys_role`
     `gmt_create`     datetime     DEFAULT NULL COMMENT '创建时间',
     `gmt_modified`   datetime     DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`role_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=62 DEFAULT CHARSET=utf8 COMMENT='角色';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 62
+  DEFAULT CHARSET = utf8 COMMENT ='角色';
 
 -- ----------------------------
 -- Records of sys_role
@@ -1435,7 +1474,9 @@ CREATE TABLE `sys_role_data_perm`
     `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
     `perm_id` bigint(20) DEFAULT NULL COMMENT '权限ID',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8 COMMENT='角色与数据权限对应关系';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 79
+  DEFAULT CHARSET = utf8 COMMENT ='角色与数据权限对应关系';
 
 -- ----------------------------
 -- Records of sys_role_data_perm
@@ -1473,7 +1514,9 @@ CREATE TABLE `sys_role_menu`
     `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
     `menu_id` bigint(20) DEFAULT NULL COMMENT '菜单ID',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4830 DEFAULT CHARSET=utf8 COMMENT='角色与菜单对应关系';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 4830
+  DEFAULT CHARSET = utf8 COMMENT ='角色与菜单对应关系';
 
 -- ----------------------------
 -- Records of sys_role_menu
@@ -2255,7 +2298,9 @@ CREATE TABLE `sys_user`
     `city`           varchar(255) DEFAULT NULL COMMENT '所在城市',
     `district`       varchar(255) DEFAULT NULL COMMENT '所在地区',
     PRIMARY KEY (`user_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=139 DEFAULT CHARSET=utf8;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 139
+  DEFAULT CHARSET = utf8;
 
 -- ----------------------------
 -- Records of sys_user
@@ -2275,7 +2320,9 @@ CREATE TABLE `sys_user_role`
     `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
     `role_id` bigint(20) DEFAULT NULL COMMENT '角色ID',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=137 DEFAULT CHARSET=utf8 COMMENT='用户与角色对应关系';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 137
+  DEFAULT CHARSET = utf8 COMMENT ='用户与角色对应关系';
 
 -- ----------------------------
 -- Records of sys_user_role
@@ -2367,7 +2414,9 @@ CREATE TABLE `user`
     `update_time`     datetime     NOT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_username` (`username`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1255664783722586113 DEFAULT CHARSET=utf8mb4;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1255664783722586113
+  DEFAULT CHARSET = utf8mb4;
 
 -- ----------------------------
 -- Records of user
@@ -2407,8 +2456,10 @@ CREATE TABLE `user_bookshelf`
     `create_time`    datetime   DEFAULT NULL,
     `update_time`    datetime   DEFAULT NULL,
     PRIMARY KEY (`id`),
-    UNIQUE KEY `key_uq_userid_bookid` (`user_id`,`book_id`) USING BTREE
+    UNIQUE KEY `key_uq_userid_bookid` (`user_id`, `book_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb4 COMMENT='用户书架表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 42
+  DEFAULT CHARSET = utf8mb4 COMMENT ='用户书架表';
 
 -- ----------------------------
 -- Records of user_bookshelf
@@ -2440,8 +2491,10 @@ CREATE TABLE `user_buy_record`
     `buy_amount`      int(11)      DEFAULT NULL COMMENT '购买使用的屋币数量',
     `create_time`     datetime     DEFAULT NULL COMMENT '购买时间',
     PRIMARY KEY (`id`),
-    UNIQUE KEY `key_userId_indexId` (`user_id`,`book_index_id`)
+    UNIQUE KEY `key_userId_indexId` (`user_id`, `book_index_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='用户消费记录表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 3
+  DEFAULT CHARSET = utf8mb4 COMMENT ='用户消费记录表';
 
 -- ----------------------------
 -- Records of user_buy_record
@@ -2464,7 +2517,9 @@ CREATE TABLE `user_feedback`
     `content`     varchar(512) DEFAULT NULL COMMENT '反馈内容',
     `create_time` datetime     DEFAULT NULL COMMENT '反馈时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 9
+  DEFAULT CHARSET = utf8mb4;
 
 -- ----------------------------
 -- Records of user_feedback
@@ -2485,8 +2540,10 @@ CREATE TABLE `user_read_history`
     `create_time`    datetime   DEFAULT NULL,
     `update_time`    datetime   DEFAULT NULL,
     PRIMARY KEY (`id`),
-    UNIQUE KEY `key_uq_userid_bookid` (`user_id`,`book_id`) USING BTREE
+    UNIQUE KEY `key_uq_userid_bookid` (`user_id`, `book_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=119 DEFAULT CHARSET=utf8mb4 COMMENT='用户阅读记录表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 119
+  DEFAULT CHARSET = utf8mb4 COMMENT ='用户阅读记录表';
 
 -- ----------------------------
 -- Records of user_read_history
@@ -2552,7 +2609,9 @@ CREATE TABLE `book_content0`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1155 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1155
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content1
@@ -2565,7 +2624,9 @@ CREATE TABLE `book_content1`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=406 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 406
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content2
@@ -2578,7 +2639,9 @@ CREATE TABLE `book_content2`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1222 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1222
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content3
@@ -2591,7 +2654,9 @@ CREATE TABLE `book_content3`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=410 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 410
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content4
@@ -2604,7 +2669,9 @@ CREATE TABLE `book_content4`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1188 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1188
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content5
@@ -2617,7 +2684,9 @@ CREATE TABLE `book_content5`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=416 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 416
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content6
@@ -2630,7 +2699,9 @@ CREATE TABLE `book_content6`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1180 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1180
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content7
@@ -2643,7 +2714,9 @@ CREATE TABLE `book_content7`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=404 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 404
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content8
@@ -2656,7 +2729,9 @@ CREATE TABLE `book_content8`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1134 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1134
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 -- ----------------------------
 -- Table structure for book_content9
@@ -2669,7 +2744,9 @@ CREATE TABLE `book_content9`
     `content`  mediumtext COMMENT '小说章节内容',
     PRIMARY KEY (`id`),
     UNIQUE KEY `key_uq_indexId` (`index_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=415 DEFAULT CHARSET=utf8mb4 COMMENT='小说内容表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 415
+  DEFAULT CHARSET = utf8mb4 COMMENT ='小说内容表';
 
 
 DROP TABLE IF EXISTS `crawl_single_task`;
@@ -2686,7 +2763,9 @@ CREATE TABLE `crawl_single_task`
     `exc_count`      tinyint(2)   DEFAULT '0' COMMENT '已经执行次数，最多执行5次',
     `create_time`    datetime     DEFAULT NULL COMMENT '创建时间',
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COMMENT='抓取单本小说任务表';
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 8
+  DEFAULT CHARSET = utf8mb4 COMMENT ='抓取单本小说任务表';
 
 -- ----------------------------
 -- Records of crawl_single_task
@@ -2716,7 +2795,8 @@ CREATE TABLE `author_income_detail`
     `income_number`  int(11)    NOT NULL DEFAULT '0' COMMENT '订阅人数',
     `create_time`    datetime            DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='稿费收入明细统计表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='稿费收入明细统计表';
 
 CREATE TABLE `author_income`
 (
@@ -2732,7 +2812,8 @@ CREATE TABLE `author_income`
     `detail`           varchar(255)        DEFAULT NULL COMMENT '详情',
     `create_time`      datetime            DEFAULT NULL,
     PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4  COMMENT='稿费收入统计表';
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='稿费收入统计表';
 
 
 alter table book
@@ -3000,3 +3081,76 @@ VALUES (410, '400', '会员反馈', 'novel/userFeedback', 'novel:userFeedback:us
 
 INSERT INTO sys_role_menu (role_id, menu_id)
 VALUES (1, 410);
+
+
+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);
+
+
+update website_info
+set logo     = 'https://youdoc.gitee.io/resource/images/logo%20(1).png',
+    logo_dark='https://youdoc.gitee.io/resource/images/logo%20(1).png'
+where id = 1;
+
+
+
+update crawl_source
+set crawl_rule = replace(crawl_rule, 'ibiquge.net', 'ibiquzw.org')
+where id = 16;
+
+update website_info
+set logo     = '/images/logo.png',
+    logo_dark='/images/logo.png'
+where id = 1;
+
+
+INSERT INTO crawl_source (source_name, crawl_rule, source_status, create_time, update_time)
+VALUES ('香书小说网', '{
+  "bookListUrl": "http://www.xbiqugu.net/fenlei/{catId}_{page}.html",
+  "catIdRule": {
+    "catId1": "1",
+    "catId2": "2",
+    "catId3": "3",
+    "catId4": "4",
+    "catId5": "6",
+    "catId6": "5"
+  },
+  "bookIdPatten": "<a\\\\s+href=\\"http://www.xbiqugu.net/(\\\\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.net/{bookId}/",
+  "bookNamePatten": "<h1>([^/]+)</h1>",
+  "authorNamePatten": "者：([^/]+)</p>",
+  "picUrlPatten": "src=\\"(http://www.xbiqugu.net/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.net/{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.net/{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;
+
+
+update crawl_source
+set crawl_rule = replace(crawl_rule, 'xbiqugu.net', 'xbiqugu.la');
+
+delete
+from sys_menu
+where menu_id = 104;
+
+delete
+from sys_menu
+where menu_id = 57;

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>4.1.0</version>
+    <version>5.1.0</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>
@@ -14,17 +14,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.8.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>
-        <sharding.jdbc.version>3.0.0</sharding.jdbc.version>
     </properties>
 
     <dependencies>
@@ -59,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>
@@ -76,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>
@@ -96,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.7.0</version>
+            <version>1.11.0</version>
         </dependency>
         <!-- shiro ehcache -->
         <dependency>
@@ -119,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>
@@ -130,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>-->
@@ -165,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>
@@ -194,18 +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>
 
+        <!-- ShardingSphere-JDBC -->
         <dependency>
-            <groupId>io.shardingsphere</groupId>
+            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <artifactId>shardingsphere-jdbc</artifactId>
-            <version>${sharding.jdbc.version}</version>
+            <version>${shardingsphere-jdbc.version}</version>
         </dependency>
-
         <dependency>
-            <groupId>io.shardingsphere</groupId>
+            <groupId>org.yaml</groupId>
-            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <artifactId>snakeyaml</artifactId>
-            <version>${sharding.jdbc.version}</version>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>runtime</scope>
         </dependency>
 
         <!--war包部署需要-->
@@ -289,6 +298,9 @@
                                 <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>
@@ -320,4 +332,35 @@
             </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-prod.yml

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

novel-admin/src/main/build/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/java/com/java2nb/AdminApplication.java

@@ -11,7 +11,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import javax.sql.DataSource;
 import java.net.InetAddress;
+import java.sql.Connection;
 
 
 @EnableTransactionManagement
@@ -23,15 +25,23 @@ import java.net.InetAddress;
 @EnableCaching
 @Slf4j
 public class AdminApplication {
+
     public static void main(String[] args) {
         SpringApplication.run(AdminApplication.class, args);
     }
 
     @Bean
-    public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
+    public CommandLineRunner commandLineRunner(ApplicationContext ctx, DataSource dataSource) {
         return args -> {
-            log.info("项目启动啦，访问路径：{}", "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + ctx.getEnvironment().getProperty("server.port"));
+            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());
         logger.info("参数 : " + Arrays.toString(joinPoint.getArgs()));
-//        loggger.info("参数 : " + joinPoint.getArgs());
 
     }
 

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

@@ -68,6 +68,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/js/**", "anon");
         filterChainDefinitionMap.put("/fonts/**", "anon");
         filterChainDefinitionMap.put("/img/**", "anon");
+        filterChainDefinitionMap.put("/favicon.ico", "anon");
         filterChainDefinitionMap.put("/docs/**", "anon");
         filterChainDefinitionMap.put("/layuimini/**", "anon");
         filterChainDefinitionMap.put("/upload/**", "anon");

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/dao/GeneratorMapper.java

@@ -9,25 +9,25 @@ import java.util.Map;
 public interface GeneratorMapper {
 
     @Select(
-        "select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables"
+        "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 count(*) from information_schema.tables where table_schema = 'novel_plus'")
+    @Select("select count(*) from tables where table_schema = 'novel_plus'")
     int count(Map<String, Object> map);
 
     @Select(
-        "select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables \r\n"
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from tables \r\n"
             + "	where table_schema = 'novel_plus' and table_name = #{tableName}")
     Map<String, String> get(String tableName);
 
     @Select(
-        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
+        "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 information_schema.columns\r\n"
+        "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/exception/MainsiteErrorController.java

@@ -2,24 +2,19 @@ package com.java2nb.common.exception;
 
 
 import com.java2nb.common.utils.R;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.error.ErrorAttributes;
 import org.springframework.boot.web.servlet.error.ErrorController;
-import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
 
 @RestController
 public class MainsiteErrorController implements ErrorController {
-    private Logger logger = LoggerFactory.getLogger(getClass());
+
     private static final String ERROR_PATH = "/error";
 
     @Autowired
@@ -58,9 +53,4 @@ public class MainsiteErrorController implements ErrorController {
         }
     }
 
-    @Override
-    public String getErrorPath() {
-        // TODO Auto-generated method stub
-        return ERROR_PATH;
-    }
 }

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

@@ -1,6 +1,5 @@
 package com.java2nb.common.utils;
 
-import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
@@ -8,6 +7,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class JSONUtils {
+
     /**
      * Bean对象转JSON
      *

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -83,7 +84,7 @@ public class FriendLinkController {
     @ResponseBody
     @PostMapping("/save")
     @RequiresPermissions("novel:friendLink:add")
-    public R save(FriendLinkDO friendLink) {
+    public R save(@Validated FriendLinkDO friendLink) {
         if (friendLinkService.save(friendLink) > 0) {
             redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
             return R.ok();
@@ -98,7 +99,7 @@ public class FriendLinkController {
     @ResponseBody
     @RequestMapping("/update")
     @RequiresPermissions("novel:friendLink:edit")
-    public R update(FriendLinkDO friendLink) {
+    public R update(@Validated FriendLinkDO friendLink) {
         friendLinkService.update(friendLink);
         redisTemplate.delete(CacheKey.INDEX_LINK_KEY);
         return R.ok();

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

@@ -1,27 +1,21 @@
 package com.java2nb.novel.domain;
 
-import java.io.Serializable;
-
-
-import java.math.BigDecimal;
-
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.java2nb.common.jsonserializer.LongToStringSerializer;
-
+import org.hibernate.validator.constraints.URL;
-
 import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
- * 
- * 
  * @author xiongxy
  * @email 1179705413@qq.com
  * @date 2023-04-14 15:12:25
  */
 public class FriendLinkDO implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
 
@@ -30,6 +24,7 @@ public class FriendLinkDO implements Serializable {
     //链接名
     private String linkName;
     //链接url
+    @URL
     private String linkUrl;
     //排序号
     private Integer sort;
@@ -58,102 +53,119 @@ public class FriendLinkDO implements Serializable {
     public void setId(Integer id) {
         this.id = id;
     }
+
     /**
      * 获取：主键
      */
     public Integer getId() {
         return id;
     }
+
     /**
      * 设置：链接名
      */
     public void setLinkName(String linkName) {
         this.linkName = linkName;
     }
+
     /**
      * 获取：链接名
      */
     public String getLinkName() {
         return linkName;
     }
+
     /**
      * 设置：链接url
      */
     public void setLinkUrl(String linkUrl) {
         this.linkUrl = linkUrl;
     }
+
     /**
      * 获取：链接url
      */
     public String getLinkUrl() {
         return linkUrl;
     }
+
     /**
      * 设置：排序号
      */
     public void setSort(Integer sort) {
         this.sort = sort;
     }
+
     /**
      * 获取：排序号
      */
     public Integer getSort() {
         return sort;
     }
+
     /**
      * 设置：是否开启，0：不开启，1：开启
      */
     public void setIsOpen(Integer isOpen) {
         this.isOpen = isOpen;
     }
+
     /**
      * 获取：是否开启，0：不开启，1：开启
      */
     public Integer getIsOpen() {
         return isOpen;
     }
+
     /**
      * 设置：创建人id
      */
     public void setCreateUserId(Long createUserId) {
         this.createUserId = createUserId;
     }
+
     /**
      * 获取：创建人id
      */
     public Long getCreateUserId() {
         return createUserId;
     }
+
     /**
      * 设置：创建时间
      */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
     /**
      * 获取：创建时间
      */
     public Date getCreateTime() {
         return createTime;
     }
+
     /**
      * 设置：更新者用户id
      */
     public void setUpdateUserId(Long updateUserId) {
         this.updateUserId = updateUserId;
     }
+
     /**
      * 获取：更新者用户id
      */
     public Long getUpdateUserId() {
         return updateUserId;
     }
+
     /**
      * 设置：更新时间
      */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
     /**
      * 获取：更新时间
      */

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

@@ -34,7 +34,6 @@ public class BookSettingServiceImpl implements BookSettingService {
             List<Long> bookIds = list.stream().map(BookSettingDO::getBookId).collect(Collectors.toList());
             Map<Long, String> bookNameMap = bookDao.batchGet(bookIds).stream()
                 .collect(Collectors.toMap(BookDO::getId, BookDO::getBookName));
-            list = list.stream().filter(v -> bookNameMap.containsKey(v.getBookId())).collect(Collectors.toList());
             list.forEach(v -> v.setBookName(bookNameMap.get(v.getBookId())));
         }
         return list;

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

@@ -7,92 +7,11 @@ logging:
     root: info
     com.java2nb: debug
 spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    username: root
-    password: test123456
-    #password:
-    initialSize: 1
-    minIdle: 3
-    maxActive: 20
-    # 配置获取连接等待超时的时间
-    maxWait: 60000
-    # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    timeBetweenEvictionRunsMillis: 60000
-    # 配置一个连接在池中最小生存的时间，单位是毫秒
-    minEvictableIdleTimeMillis: 30000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    # 打开PSCache，并且指定每个连接上PSCache的大小
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-    filters: stat,slf4j
-    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    # 合并多个DruidDataSource的监控数据
-    #useGlobalDataSourceStat: true
   redis:
     host: 127.0.0.1
     port: 6379
     password: test123456
     # 连接超时时间（毫秒）
     timeout: 10000
-    jedis:
-      pool:
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池中的最小空闲连接
-        min-idle: 10
-        # 连接池最大连接数（使用负值表示没有限制）
-        max-active: 100
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1
 
 
-
-####使用shardingJdbc时，
-####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
-##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
-
-sharding:
-  jdbc:
-    datasource:
-      names: ds0,ds1
-      ds0:
-        type: com.zaxxer.hikari.HikariDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: root
-        password: test123456
-      ds1:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-        url: jdbc:mysql://localhost:3306/information_schema?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: root
-        password: test123456
-    config:
-      sharding:
-        props:
-          sql.show: true
-        tables:
-          book_content: #book_content表
-            key-generator-column-name: id  #主键
-            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
-            #            database-strategy:  #分库策略
-            #              inline:
-            #                sharding-column: book_id
-            #                algorithm-expression: ds${book_id % 10}
-            table-strategy: #分表策略
-              inline:
-                shardingColumn: index_id
-                algorithm-expression: book_content${index_id % 10}
-          tables:
-            actual-data-nodes: ds${1}.tables
-          columns:
-            actual-data-nodes: ds${1}.columns
-        default-data-source-name: ds0

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

@@ -7,86 +7,11 @@ logging:
     root: error
     com.java2nb: error
 spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-    username: root
-    password: test123456
-    #password:
-    initialSize: 1
-    minIdle: 3
-    maxActive: 20
-    # 配置获取连接等待超时的时间
-    maxWait: 60000
-    # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-    timeBetweenEvictionRunsMillis: 60000
-    # 配置一个连接在池中最小生存的时间，单位是毫秒
-    minEvictableIdleTimeMillis: 30000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    # 打开PSCache，并且指定每个连接上PSCache的大小
-    poolPreparedStatements: true
-    maxPoolPreparedStatementPerConnectionSize: 20
-    # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
-    filters: stat,slf4j
-    # 通过connectProperties属性来打开mergeSql功能；慢SQL记录
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    # 合并多个DruidDataSource的监控数据
-    #useGlobalDataSourceStat: true
   redis:
     host: 127.0.0.1
     port: 6379
-    password: test
+    password: test123456
     # 连接超时时间（毫秒）
     timeout: 10000
-    jedis:
-      pool:
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池中的最小空闲连接
-        min-idle: 10
-        # 连接池最大连接数（使用负值表示没有限制）
-        max-active: 100
-        # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        max-wait: -1
 
 
-####使用shardingJdbc时，
-####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
-##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
-
-sharding:
-  jdbc:
-    datasource:
-      names: ds0 #,ds1
-      ds0:
-        type: com.zaxxer.hikari.HikariDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-        username: root
-        password: test123456
-    #      ds1:
-    #        type: com.alibaba.druid.pool.DruidDataSource
-    #        driver-class-name: com.mysql.jdbc.Driver
-    #        url: jdbc:mysql://localhost:3306/novel_plus2
-    #        username: root
-    #        password: test123456
-    config:
-      sharding:
-        props:
-          sql.show: true
-        tables:
-          book_content: #book_content表
-            key-generator-column-name: id  #主键
-            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
-            #            database-strategy:  #分库策略
-            #              inline:
-            #                sharding-column: book_id
-            #                algorithm-expression: ds${book_id % 10}
-            table-strategy: #分表策略
-              inline:
-                shardingColumn: index_id
-                algorithm-expression: book_content${index_id % 10}

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

@@ -9,6 +9,9 @@ server:
 #  basic:
 #    enabled: false
 spring:
+  datasource:
+    driverClassName: org.apache.shardingsphere.driver.ShardingSphereDriver
+    url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml
   thymeleaf:
     mode: LEGACYHTML5
     cache: false
@@ -18,14 +21,12 @@ spring:
   profiles:
     active: dev
   
-  #上传文件的最大值（10M）
+  #上传文件的最大值（100M）
   servlet:
     multipart:
-      max-file-size: 10485760
+      max-file-size: 100MB
+      max-request-size: 100MB
 
-  devtools:
-    restart:
-      enabled: true
   main:
     allow-bean-definition-overriding: true
 
@@ -35,9 +36,6 @@ mybatis:
     map-underscore-to-camel-case: true
   mapper-locations: mybatis/**/*Mapper.xml
   typeAliasesPackage: com.java2nb.**.domain
-#[弃用]配置缓存和session存储方式，默认ehcache,可选redis,[弃用]调整至 spring cache type【shiro.用户，权限，session，spring.cache通用】
-#[弃用]cacheType: ehcache
-
 
 logging:
   config: classpath:logback-boot.xml

novel-admin/src/main/resources/static/js/appjs/novel/websiteInfo/edit.js

@@ -79,7 +79,7 @@ function update() {
         },
         success: function (data) {
             if (data.code == 0) {
-                layer.msg("操作成功");
+                layer.msg("操作成功，重启 novel-front 后生效");
             } else {
                 layer.alert(data.msg)
             }

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

@@ -6,7 +6,7 @@
     <title>小说精品屋 - 文件管理器</title>
     <meta name="keywords" content="">
     <meta name="description" content="">
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="/favicon.ico">
     <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="/css/font-awesome.css?v=4.4.0" rel="stylesheet">
     <link href="/css/animate.css" rel="stylesheet">

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

@@ -6,7 +6,7 @@
 <title>403 页面</title>
 <meta name="keywords" content="">
 <meta name="description" content="">
-<link rel="shortcut icon" href="favicon.ico">
+<link rel="shortcut icon" href="/favicon.ico">
 <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
 <link href="/css/font-awesome.css?v=4.4.0" rel="stylesheet">
 <link href="/css/animate.css" rel="stylesheet">

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

@@ -10,7 +10,7 @@
     <meta name="keywords" content="">
     <meta name="description" content="">
 
-    <link rel="shortcut icon" href="favicon.ico"> <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+    <link rel="shortcut icon" href="/favicon.ico"> <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="/css/font-awesome.css?v=4.4.0" rel="stylesheet">
 
     <link href="/css/animate.css" rel="stylesheet">

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

@@ -11,7 +11,7 @@
     <meta name="keywords" content="">
     <meta name="description" content="">
 
-    <link rel="shortcut icon" href="favicon.ico"> <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+    <link rel="shortcut icon" href="/favicon.ico"> <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="/css/font-awesome.css?v=4.4.0" rel="stylesheet">
 
     <link href="/css/animate.css" rel="stylesheet">

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

@@ -6,7 +6,7 @@
     <title>500错误</title>
     <meta name="keywords" content="">
     <meta name="description" content="">
-    <link rel="shortcut icon" href="favicon.ico"> <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+    <link rel="shortcut icon" href="/favicon.ico"> <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="/css/font-awesome.css?v=4.4.0" rel="stylesheet">
     <link href="/css/animate.css" rel="stylesheet">
     <link href="/css/style.css?v=4.1.0" rel="stylesheet">

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

@@ -4,7 +4,7 @@
 	<title></title>
 	<meta name="keywords" content="">
 	<meta name="description" content="">
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="/favicon.ico">
 	<link href="css/bootstrap.min.css?v=3.3.6"
 		  th:href="@{/css/bootstrap.min.css?v=3.3.6}" rel="stylesheet">
 	<link href="/css/font-awesome.css?v=4.4.0"

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

@@ -10,7 +10,7 @@
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html"/>
     <![endif]-->
-    <link rel="shortcut icon" href="favicon.ico">
+    <link rel="shortcut icon" href="/favicon.ico">
     <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
     <link href="/css/font-awesome.min.css?v=4.4.0" rel="stylesheet">
     <link href="/css/plugins/toastr/toastr.min.css" rel="stylesheet">

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

@@ -23,7 +23,7 @@
                             <div class="col-sm-8">
                                 <input id="linkUrl" name="linkUrl"
                                        class="form-control"
-                                       type="text" required>
+                                       type="url" required>
 
                             </div>
                         </div>

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

@@ -26,7 +26,7 @@
                                 <input id="linkUrl" name="linkUrl"
                                        th:value="${friendLink.linkUrl}"
                                        class="form-control"
-                                       type="text" required>
+                                       type="url" required>
                             </div>
                         </div>
                         <div class="form-group">

novel-admin/src/main/resources/templates/system/menu/edit.html

@@ -11,7 +11,7 @@
 <meta name="keywords" content="">
 <meta name="description" content="">
 
-<link rel="shortcut icon" href="favicon.ico">
+<link rel="shortcut icon" href="/favicon.ico">
 <link href="/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
 <link href="/css/font-awesome.css?v=4.4.0" rel="stylesheet">
 <link href="/css/animate.css" rel="stylesheet">

novel-admin/src/main/resources/templates/system/user/include.html

@@ -4,7 +4,7 @@
 	<title></title>
 	<meta name="keywords" content="">
 	<meta name="description" content="">
-	<link rel="shortcut icon" href="favicon.ico">
+	<link rel="shortcut icon" href="/favicon.ico">
 	<link rel="stylesheet" href="/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="/css/animate.css" />
 	<link rel="stylesheet" href="/css/font-awesome.css" />

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>4.1.0</version>
+        <version>5.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -52,18 +52,16 @@
         </dependency>
 
         <!-- 分库分表-->
-        <!-- sharding jdbc依赖 -->
+        <!-- ShardingSphere-JDBC -->
-
         <dependency>
-            <groupId>io.shardingsphere</groupId>
+            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <artifactId>shardingsphere-jdbc</artifactId>
-            <version>${sharding.jdbc.version}</version>
+            <version>${shardingsphere-jdbc.version}</version>
         </dependency>
-
         <dependency>
-            <groupId>io.shardingsphere</groupId>
+            <groupId>com.h2database</groupId>
-            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <artifactId>h2</artifactId>
-            <version>${sharding.jdbc.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
 
@@ -73,11 +71,6 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>${pagehelper.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.cuisongliu</groupId>
-            <artifactId>orderbyhelper-spring-boot-starter</artifactId>
-            <version>${orderbyhelper.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -86,15 +79,8 @@
         </dependency>
         <!--httpclient-->
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient</artifactId>
+            <artifactId>httpclient5</artifactId>
-            <version>4.5.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -117,6 +103,12 @@
             <optional>true</optional>
         </dependency>
 
+        <!-- 请求参数校验相关 -->
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.github.xxyopen</groupId>
             <artifactId>xxy-model</artifactId>
@@ -138,5 +130,29 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <zip destfile='${project.build.directory}/build/sql.zip'>
+                                    <zipfileset filemode="755" dir='${basedir}/../doc/sql'/>
+                                </zip>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>