Merge remote-tracking branch 'Gitee/4.3.x' into 4.3.x

merge

.github/workflows/release.yml

@@ -1,79 +0,0 @@
-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,28 +1,28 @@
-<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>
+[![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://github.com/201206030/novel-plus'><img alt="Github stars" src="https://img.shields.io/github/stars/201206030/novel-plus?logo=github"></a>
     <a href='https://github.com/201206030/novel-plus'><img alt="Github forks" src="https://img.shields.io/github/forks/201206030/novel-plus?logo=github"></a>
     <a href='https://gitee.com/novel_dev_team/novel-plus'><img alt="Gitee stars" src="https://gitee.com/novel_dev_team/novel-plus/badge/star.svg?theme=gitee"></a>
     <a href='https://gitee.com/novel_dev_team/novel-plus'><img alt="Gitee forks" src="https://gitee.com/novel_dev_team/novel-plus/badge/fork.svg?theme=gitee"></a>
+    <a href="https://github.com/201206030/novel-plus"><img src="https://visitor-badge.glitch.me/badge?page_id=201206030.novel-plus" alt="visitors"></a>
 </p>
 
 <p align="center">
-      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='http://117.72.165.13:8888'>演示站点</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/1.html'>安装教程</a>
+      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='https://www.bilibili.com/video/BV1Zo4y187Mi'>项目演示</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/1.html'>安装教程</a>
 </p> 
 
 ## 项目介绍
 
 novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
 系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
-TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、AI写作、会员充值、订阅模式、新闻发布和实时统计报表。
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、会员充值、订阅模式、新闻发布和实时统计报表。
 
 ## 项目地址
 
 - 学习版：[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)
+  ｜ [保姆级教程](https://docs.xxyopen.com)
+- **应用版**：[GitHub](https://github.com/201206030/novel-plus) ｜ [码云](https://gitee.com/novel_dev_team/novel-plus)
 - 微服务版：[GitHub](https://github.com/201206030/novel-cloud) ｜ [码云](https://gitee.com/novel_dev_team/novel-cloud)
 
 ## 项目结构
@@ -38,25 +38,24 @@ novel-plus -- 父工程
 
 ## 技术选型
 
-| 技术                  | 说明                  
-|---------------------|---------------------
-| Spring Boot         | Spring 应用快速开发脚手架    
-| Spring AI           | Spring 官方 AI 框架     
-| MyBatis             | 持久层 ORM 框架          
-| MyBatis Dynamic SQL | Mybatis 动态 sql      
-| PageHelper          | MyBatis 分页插件        
-| MyBatis Generator   | 持久层代码生成插件           
-| Sharding-JDBC       | 代码层分库分表中间件          
-| JJWT                | JWT 登录支持            
-| Spring Security     | 安全框架                
-| Apache Shiro        | 安全框架                
-| Redis               | 缓存方案                
-| Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案） 
-| Lombok              | 简化对象封装工具            
-| Docker              | 应用容器引擎              
-| MySQL               | 数据库服务               
-| Thymeleaf           | 模板引擎                
-| Layui               | 前端 UI 框架            
+| 技术                  | 说明
+|---------------------| ---------------------------
+| Spring Boot         | Spring 应用快速开发脚手架
+| MyBatis             | 持久层 ORM 框架
+| MyBatis Dynamic SQL | Mybatis 动态 sql
+| PageHelper          | MyBatis 分页插件
+| MyBatis Generator    | 持久层代码生成插件
+| Sharding-JDBC       | 代码层分库分表中间件
+| JJWT                | JWT 登录支持
+| Spring Security      | 安全框架
+| Apache Shiro               | 安全框架
+| Redis               | 缓存方案
+| Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案）
+| Lombok              | 简化对象封装工具
+| Docker              | 应用容器引擎
+| MySQL               | 数据库服务
+| Thymeleaf           | 模板引擎
+| Layui               | 前端 UI 框架
 
 ## 项目截图
 
@@ -70,39 +69,6 @@ novel-plus -- 父工程
 
 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 技术的发展，并致力于将其与小说创作场景深度融合，为用户带来更智能、更便捷的创作工具。
-
-novel-plus 项目默认使用的是第三方大模型服务平台[硅基流动](https://cloud.siliconflow.cn/i/DOgMRH9S)提供的 API（兼容 OpenAI 的相关接口，可直接通过 Spring AI 框架调用），采用的 AI 模型有对话模型`deepseek-ai/DeepSeek-R1-0528-Qwen3-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-0528-Qwen3-8B
-```
-
-⚠️ novel-plus 项目默认使用的都是免费 AI 模型，生成效果有限。如果对生成内容有更高的要求，建议选用付费的 AI 模型。
-
 ## 增值服务
 
 👉 [了解详情](https://novel.xxyopen.com/service.htm)
@@ -127,5 +93,3 @@ spring:
 ## 免责声明
 
 本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
-
-

config/shardingsphere-jdbc.yml

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

@@ -1,44 +0,0 @@
-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

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

doc/sql/20250711.sql

@@ -1,3 +0,0 @@
-alter table crawl_single_task add column crawl_chapters int DEFAULT 0 COMMENT '采集章节数量' after exc_count ;
-
-

doc/sql/20250712.sql

@@ -1,13 +0,0 @@
-DROP TABLE IF EXISTS `book_comment_reply`;
-CREATE TABLE `book_comment_reply`
-(
-    `id`             bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `comment_id`     bigint(20)   DEFAULT NULL COMMENT '评论ID',
-    `reply_content`  varchar(512) DEFAULT NULL COMMENT '回复内容',
-    `location` varchar(50) DEFAULT NULL COMMENT '地理位置',
-    `audit_status`   tinyint(1)   DEFAULT '0' COMMENT '审核状态，0：待审核，1：审核通过，2：审核不通过',
-    `create_time`    datetime     DEFAULT NULL COMMENT '回复用户ID',
-    `create_user_id` bigint(20)   DEFAULT NULL COMMENT '回复时间',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='小说评论回复表';

doc/sql/novel_plus.sql

@@ -1,5 +1,7 @@
-CREATE database if NOT EXISTS `novel_plus` default character set utf8mb4 collate utf8mb4_unicode_ci;
-use `novel_plus`;
+CREATE
+    database if NOT EXISTS `novel_plus` default character set utf8mb4 collate utf8mb4_unicode_ci;
+use
+    `novel_plus`;
 
 SET NAMES utf8mb4;
 
@@ -3103,114 +3105,4 @@ 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;
-
-
-alter table book_comment add column location varchar(50) DEFAULT NULL COMMENT '地理位置' after comment_content ;
-
-
-alter table crawl_single_task add column crawl_chapters int DEFAULT 0 COMMENT '采集章节数量' after exc_count ;
-
-
-DROP TABLE IF EXISTS `book_comment_reply`;
-CREATE TABLE `book_comment_reply`
-(
-    `id`             bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-    `comment_id`     bigint(20)   DEFAULT NULL COMMENT '评论ID',
-    `reply_content`  varchar(512) DEFAULT NULL COMMENT '回复内容',
-    `location` varchar(50) DEFAULT NULL COMMENT '地理位置',
-    `audit_status`   tinyint(1)   DEFAULT '0' COMMENT '审核状态，0：待审核，1：审核通过，2：审核不通过',
-    `create_time`    datetime     DEFAULT NULL COMMENT '回复用户ID',
-    `create_user_id` bigint(20)   DEFAULT NULL COMMENT '回复时间',
-    PRIMARY KEY (`id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='小说评论回复表';
-
-
-INSERT INTO crawl_source (source_name, crawl_rule, source_status, create_time
-                         , update_time)
-VALUES ('飘天文学网（海外专用）', '{
-    "bookListUrl": "https://www.piaotia.com/booksort{catId}/{page}.html",
-    "catIdRule": {
-        "catId1": "1/0",
-        "catId2": "2/0",
-        "catId3": "3/0",
-        "catId4": "4/0",
-        "catId5": "6/0",
-        "catId6": "5/0"
-    },
-    "bookIdPatten": "href=\\"https://www.piaotia.com/bookinfo/(\\\\d+/\\\\d+).html\\"",
-    "pagePatten": "<em\\\\s+id=\\"pagestats\\">(\\\\d+)/\\\\d+</em>",
-    "totalPagePatten": "<em\\\\s+id=\\"pagestats\\">\\\\d+/(\\\\d+)</em>",
-    "bookDetailUrl": "https://www.piaotia.com/bookinfo/{bookId}.html",
-    "bookNamePatten": "<h1>([^/]+)</h1>",
-    "authorNamePatten": "<td\\\\s+width=\\"\\\\d+%\\">作&nbsp;&nbsp;&nbsp; 者：([^/]+)<",
-    "picUrlPatten": "<img\\\\s+src=\\"(https://www.piaotia.com/files/article/image/[^\\"]+)\\"",
-    "statusPatten": "<td>文章状态：([^/]+)</td>",
-    "bookStatusRule": {
-        "连载中": 0,
-        "已完成": 1
-    },
-    "descStart": " <span class=\\"hottext\\">内容简介：</span><br />",
-    "descEnd": "</td>",
-    "filterDesc": "",
-    "bookIndexUrl": "https://www.piaotia.com/html/{bookId}/index.html",
-    "indexIdPatten": "<li><a href=\\"(\\\\d+).html\\">[^/]+</a></li>",
-    "indexNamePatten": "<li><a href=\\"\\\\d+.html\\">([^/]+)</a></li>",
-    "bookContentUrl": "https://www.piaotia.com/html/{bookId}/{indexId}.html",
-    "contentStart": "<br>",
-    "contentEnd": "</div>",
-    "filterContent": "",
-    "charset": "gbk"
-}', 0, '2025-07-13 18:57:39'
-       , '2025-07-13 18:57:39');
+where id = 1;

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>5.2.3</version>
+    <version>4.3.0</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>
@@ -14,14 +14,18 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>2.1.18.RELEASE</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <java.version>21</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>1.8</java.version>
         <velocity.version>1.7</velocity.version>
-        <shardingsphere-jdbc.version>5.5.1</shardingsphere-jdbc.version>
+        <activiti.version>5.22.0</activiti.version>
+        <sharding.jdbc.version>3.0.0</sharding.jdbc.version>
+        <jackson.version>2.15.1</jackson.version>
     </properties>
 
     <dependencies>
@@ -56,24 +60,35 @@
             <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.29</version>
         </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.6</version>
+        </dependency>
 
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>1.1.1</version>
         </dependency>
+        <!--druid -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.2.9</version>
+        </dependency>
         <!--commons -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.6</version>
+        </dependency>
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
@@ -123,12 +138,6 @@
             <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>-->
@@ -157,12 +166,6 @@
             <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>
@@ -192,29 +195,24 @@
             <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>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-jdbc</artifactId>
-            <version>${shardingsphere-jdbc.version}</version>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>${sharding.jdbc.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>2.2</version>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <version>${sharding.jdbc.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!--war包部署需要-->
@@ -332,35 +330,4 @@
             </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

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

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

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

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

@@ -1,47 +0,0 @@
-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/java/com/java2nb/AdminApplication.java

@@ -11,37 +11,27 @@ 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
 @ServletComponentScan
 @MapperScan("com.java2nb.*.dao")
 @SpringBootApplication(exclude = {
-    org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+        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) {
+    public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
         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"));
+            log.info("项目启动啦，访问路径：{}", "http://" + InetAddress.getLocalHost().getHostAddress() + ":" + ctx.getEnvironment().getProperty("server.port"));
         };
     }
+
 }

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

@@ -1,14 +0,0 @@
-package com.java2nb.common.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 标记某个方法参数需要进行 Map 字段的清理和标准化处理。
- *
- * <p>通常用于 DAO 接口中 list 方法的 Map 参数，用于防止非法排序字段或排序顺序。</p>
- */
-@Target(ElementType.PARAMETER)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface SanitizeMap {
-}

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

@@ -1,69 +0,0 @@
-package com.java2nb.common.aspect;
-
-import com.java2nb.common.annotation.SanitizeMap;
-import com.java2nb.common.utils.SortWhitelistUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Map;
-
-/**
- * 拦截所有 Mapper 接口的 list* 方法，对带有 @SanitizeMap 注解的 Map 参数进行排序字段和顺序的规范化处理。
- *
- * <p>主要防止 SQL 注入或非法排序字段、非法排序顺序的问题。
- * 例如对 sort 和 order 字段进行白名单过滤和标准化处理。</p>
- */
-@Aspect
-@Component
-@RequiredArgsConstructor
-public class MapSortValidationAspect {
-
-    /**
-     * 拦截所有 Mapper 接口的 list* 方法（如 list(), listByPage 等）。
-     * 对带有 @SanitizeMap 注解的 Map 参数进行处理。
-     *
-     * <p>执行逻辑：</p>
-     * <ol>
-     *   <li>获取方法参数及注解信息</li>
-     *   <li>遍历所有参数，检查是否带有 @SanitizeMap 注解</li>
-     *   <li>如果参数是 Map 类型且有注解，则进行字段清理</li>
-     * </ol>
-     *
-     * @param joinPoint 切点信息
-     * @return 方法执行结果
-     */
-    @SneakyThrows
-    @Around("execution(* com.java2nb.*.dao.*Dao.list*(..))")
-    public Object sanitizeMapParameters(ProceedingJoinPoint joinPoint) {
-        Object[] args = joinPoint.getArgs();
-        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
-        Method method = signature.getMethod();
-
-        Annotation[][] parameterAnnotations = method.getParameterAnnotations();
-
-        for (int i = 0; i < parameterAnnotations.length; i++) {
-            boolean hasAnnotation = Arrays.stream(parameterAnnotations[i])
-                .anyMatch(a -> a.annotationType().equals(SanitizeMap.class));
-
-            if (hasAnnotation && args[i] instanceof Map map) {
-                if (map.get("sort") instanceof String sortStr) {
-                    map.put("sort", SortWhitelistUtil.sanitizeColumn(sortStr));
-                }
-                if (map.get("order") instanceof String orderStr) {
-                    map.put("order", SortWhitelistUtil.sanitizeOrder(orderStr));
-                }
-            }
-        }
-
-        return joinPoint.proceed(args);
-    }
-
-}

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 package com.java2nb.common.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
 import com.java2nb.common.domain.DictDO;
 
 import java.util.List;
@@ -20,7 +19,7 @@ public interface DictDao {
 
 	DictDO get(Long id);
 
-	List<DictDO> list(@SanitizeMap Map<String, Object> map);
+	List<DictDO> list(Map<String, Object> map);
 
 	int count(Map<String, Object> map);
 

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

@@ -1,6 +1,5 @@
 package com.java2nb.common.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
 import com.java2nb.common.domain.FileDO;
 
 import java.util.List;
@@ -19,7 +18,7 @@ public interface FileDao {
 
 	FileDO get(Long id);
 	
-	List<FileDO> list(@SanitizeMap Map<String,Object> map);
+	List<FileDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -3,7 +3,6 @@ package com.java2nb.common.dao;
 import java.util.List;
 import java.util.Map;
 
-import com.java2nb.common.annotation.SanitizeMap;
 import com.java2nb.common.domain.GenColumnsDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -20,7 +19,7 @@ public interface GenColumnsDao {
 
 	GenColumnsDO get(Long id);
 
-	List<GenColumnsDO> list(@SanitizeMap Map<String,Object> map);
+	List<GenColumnsDO> list(Map<String,Object> map);
 
 	int count(Map<String,Object> map);
 

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 tables"
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables"
             + " where table_schema = 'novel_plus' and table_name like concat('%',#{tableName},'%')")
     List<Map<String, Object>> list(@Param("tableName") String tableName);
 
-    @Select("select count(*) from tables where table_schema = 'novel_plus'")
+    @Select("select count(*) from information_schema.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 tables \r\n"
+        "select table_name tableName, engine, table_comment tableComment, create_time createTime from information_schema.tables \r\n"
             + "	where table_schema = 'novel_plus' and table_name = #{tableName}")
     Map<String, String> get(String tableName);
 
     @Select(
-        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from columns\r\n"
+        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
             + " where table_name = #{tableName} and table_schema = 'novel_plus' order by ordinal_position")
     List<Map<String, String>> listColumns(String tableName);
 
     @Select(
-        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from columns\r\n"
+        "select column_name columnName, data_type dataType, column_comment columnComment, column_key columnKey, extra from information_schema.columns\r\n"
             + " where table_name = #{tableName} and table_schema = 'novel_plus' and column_key = 'PRI' limit 1")
     Map<String, String> getPriColumn(String tableName);
 }

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

@@ -1,6 +1,5 @@
 package com.java2nb.common.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
 import com.java2nb.common.domain.LogDO;
 
 import java.util.List;
@@ -19,7 +18,7 @@ public interface LogDao {
 
 	LogDO get(Long id);
 	
-	List<LogDO> list(@SanitizeMap Map<String,Object> map);
+	List<LogDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

novel-admin/src/main/java/com/java2nb/common/exception/MainsiteErrorController.java

@@ -2,27 +2,32 @@ 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
     ErrorAttributes errorAttributes;
 
     @RequestMapping(
-        value = {ERROR_PATH},
-        produces = {"text/html"}
+            value = {ERROR_PATH},
+            produces = {"text/html"}
     )
     public ModelAndView errorHtml(HttpServletRequest request, HttpServletResponse response) {
         int code = response.getStatus();
@@ -53,4 +58,9 @@ 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,5 +1,6 @@
 package com.java2nb.common.utils;
 
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 
@@ -7,80 +8,79 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class JSONUtils {
+	/**
+	 * Bean对象转JSON
+	 * 
+	 * @param object
+	 * @param dataFormatString
+	 * @return
+	 */
+	public static String beanToJson(Object object, String dataFormatString) {
+		if (object != null) {
+			if (StringUtils.isEmpty(dataFormatString)) {
+				return JSONObject.toJSONString(object);
+			}
+			return JSON.toJSONStringWithDateFormat(object, dataFormatString);
+		} else {
+			return null;
+		}
+	}
 
-    /**
-     * Bean对象转JSON
-     *
-     * @param object
-     * @param dataFormatString
-     * @return
-     */
-    public static String beanToJson(Object object, String dataFormatString) {
-        if (object != null) {
-            if (StringUtils.isEmpty(dataFormatString)) {
-                return JSONObject.toJSONString(object);
-            }
-            return JSON.toJSONStringWithDateFormat(object, dataFormatString);
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * Bean对象转JSON
+	 * 
+	 * @param object
+	 * @return
+	 */
+	public static String beanToJson(Object object) {
+		if (object != null) {
+			return JSON.toJSONString(object);
+		} else {
+			return null;
+		}
+	}
 
-    /**
-     * Bean对象转JSON
-     *
-     * @param object
-     * @return
-     */
-    public static String beanToJson(Object object) {
-        if (object != null) {
-            return JSON.toJSONString(object);
-        } else {
-            return null;
-        }
-    }
+	/**
+	 * String转JSON字符串
+	 * 
+	 * @param key
+	 * @param value
+	 * @return
+	 */
+	public static String stringToJsonByFastjson(String key, String value) {
+		if (StringUtils.isEmpty(key) || StringUtils.isEmpty(value)) {
+			return null;
+		}
+		Map<String, String> map = new HashMap<String, String>(16);
+		map.put(key, value);
+		return beanToJson(map, null);
+	}
 
-    /**
-     * String转JSON字符串
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    public static String stringToJsonByFastjson(String key, String value) {
-        if (StringUtils.isEmpty(key) || StringUtils.isEmpty(value)) {
-            return null;
-        }
-        Map<String, String> map = new HashMap<String, String>(16);
-        map.put(key, value);
-        return beanToJson(map, null);
-    }
+	/**
+	 * 将json字符串转换成对象
+	 * 
+	 * @param json
+	 * @param clazz
+	 * @return
+	 */
+	public static Object jsonToBean(String json, Object clazz) {
+		if (StringUtils.isEmpty(json) || clazz == null) {
+			return null;
+		}
+		return JSON.parseObject(json, clazz.getClass());
+	}
 
-    /**
-     * 将json字符串转换成对象
-     *
-     * @param json
-     * @param clazz
-     * @return
-     */
-    public static Object jsonToBean(String json, Object clazz) {
-        if (StringUtils.isEmpty(json) || clazz == null) {
-            return null;
-        }
-        return JSON.parseObject(json, clazz.getClass());
-    }
-
-    /**
-     * json字符串转map
-     *
-     * @param json
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static Map<String, Object> jsonToMap(String json) {
-        if (StringUtils.isEmpty(json)) {
-            return null;
-        }
-        return JSON.parseObject(json, Map.class);
-    }
+	/**
+	 * json字符串转map
+	 * 
+	 * @param json
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static Map<String, Object> jsonToMap(String json) {
+		if (StringUtils.isEmpty(json)) {
+			return null;
+		}
+		return JSON.parseObject(json, Map.class);
+	}
 }

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

@@ -1,43 +0,0 @@
-package com.java2nb.common.utils;
-
-import lombok.experimental.UtilityClass;
-
-import java.util.Set;
-
-/**
- * 排序字段和排序顺序的白名单工具类。
- */
-@UtilityClass
-public class SortWhitelistUtil {
-
-    // 白名单字段
-    private static final Set<String> ALLOWED_COLUMNS = Set.of("id", "name", "order_num");
-
-    // 白名单排序方式
-    private static final Set<String> ALLOWED_ORDERS = Set.of("asc", "desc");
-
-    /**
-     * 对排序字段进行白名单过滤和标准化。
-     *
-     * @param column 原始字段名
-     * @return 安全的字段名，若非法则返回 null
-     */
-    public static String sanitizeColumn(String column) {
-        if (column == null) return null;
-        String lower = column.trim().toLowerCase();
-        return ALLOWED_COLUMNS.contains(lower) ? lower : null;
-    }
-
-    /**
-     * 对排序方式进行白名单过滤和标准化。
-     *
-     * @param order 原始排序方式
-     * @return 安全的排序方式（"asc" 或 "desc"），若非法则返回 null
-     */
-    public static String sanitizeOrder(String order) {
-        if (order == null) return null;
-        String lower = order.trim().toLowerCase();
-        return ALLOWED_ORDERS.contains(lower) ? lower : null;
-    }
-
-}

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.AuthorCodeDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface AuthorCodeDao {
 
 	AuthorCodeDO get(Long id);
 	
-	List<AuthorCodeDO> list(@SanitizeMap Map<String,Object> map);
+	List<AuthorCodeDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,6 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
 import com.java2nb.novel.domain.AuthorDO;
 
 import java.util.Date;
@@ -20,7 +19,7 @@ public interface AuthorDao {
 
 	AuthorDO get(Long id);
 	
-	List<AuthorDO> list(@SanitizeMap Map<String,Object> map);
+	List<AuthorDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.BookCommentDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface BookCommentDao {
 
 	BookCommentDO get(Long id);
 	
-	List<BookCommentDO> list(@SanitizeMap Map<String,Object> map);
+	List<BookCommentDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.BookContentDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -20,7 +18,7 @@ public interface BookContentDao {
 
     BookContentDO get(Long id);
 
-    List<BookContentDO> list(@SanitizeMap Map<String, Object> map);
+    List<BookContentDO> list(Map<String, Object> map);
 
     int count(Map<String, Object> map);
 

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.BookDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -21,7 +19,7 @@ public interface BookDao {
 
     BookDO get(Long id);
 
-    List<BookDO> list(@SanitizeMap Map<String, Object> map);
+    List<BookDO> list(Map<String, Object> map);
 
     int count(Map<String, Object> map);
 

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.BookIndexDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -20,7 +18,7 @@ public interface BookIndexDao {
 
     BookIndexDO get(Long id);
 
-    List<BookIndexDO> list(@SanitizeMap Map<String, Object> map);
+    List<BookIndexDO> list(Map<String, Object> map);
 
     int count(Map<String, Object> map);
 

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.BookSettingDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface BookSettingDao {
 
 	BookSettingDO get(Long id);
 	
-	List<BookSettingDO> list(@SanitizeMap Map<String,Object> map);
+	List<BookSettingDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.CategoryDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface CategoryDao {
 
 	CategoryDO get(Integer id);
 	
-	List<CategoryDO> list(@SanitizeMap Map<String,Object> map);
+	List<CategoryDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.FriendLinkDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface FriendLinkDao {
 
 	FriendLinkDO get(Integer id);
 	
-	List<FriendLinkDO> list(@SanitizeMap Map<String,Object> map);
+	List<FriendLinkDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.NewsDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface NewsDao {
 
 	NewsDO get(Long id);
 	
-	List<NewsDO> list(@SanitizeMap Map<String,Object> map);
+	List<NewsDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.PayDO;
 
 import java.util.Date;
@@ -21,7 +19,7 @@ public interface PayDao {
 
 	PayDO get(Long id);
 	
-	List<PayDO> list(@SanitizeMap Map<String,Object> map);
+	List<PayDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.UserDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -19,7 +17,7 @@ public interface UserDao {
 
     UserDO get(Long id);
 
-    List<UserDO> list(@SanitizeMap Map<String, Object> map);
+    List<UserDO> list(Map<String, Object> map);
 
     int count(Map<String, Object> map);
 

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.UserFeedbackDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface UserFeedbackDao {
 
 	UserFeedbackDO get(Long id);
 	
-	List<UserFeedbackDO> list(@SanitizeMap Map<String,Object> map);
+	List<UserFeedbackDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.novel.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.novel.domain.WebsiteInfoDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface WebsiteInfoDao {
 
 	WebsiteInfoDO get(Long id);
 	
-	List<WebsiteInfoDO> list(@SanitizeMap Map<String,Object> map);
+	List<WebsiteInfoDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.DataPermDO;
 
 import java.util.List;
@@ -21,7 +19,7 @@ public interface DataPermDao {
 
 	DataPermDO get(Long id);
 	
-	List<DataPermDO> list(@SanitizeMap Map<String,Object> map);
+	List<DataPermDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.DeptDO;
 
 import java.util.List;
@@ -21,7 +19,7 @@ public interface DeptDao {
 
 	DeptDO get(Long deptId);
 	
-	List<DeptDO> list(@SanitizeMap Map<String,Object> map);
+	List<DeptDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.MenuDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface MenuDao {
 
 	MenuDO get(Long menuId);
 	
-	List<MenuDO> list(@SanitizeMap Map<String,Object> map);
+	List<MenuDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.RoleDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface RoleDao {
 
 	RoleDO get(Long roleId);
 	
-	List<RoleDO> list(@SanitizeMap Map<String,Object> map);
+	List<RoleDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.RoleDataPermDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface RoleDataPermDao {
 
 	RoleDataPermDO get(Long id);
 	
-	List<RoleDataPermDO> list(@SanitizeMap Map<String,Object> map);
+	List<RoleDataPermDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.RoleMenuDO;
 
 import java.util.List;
@@ -20,7 +18,7 @@ public interface RoleMenuDao {
 
 	RoleMenuDO get(Long id);
 	
-	List<RoleMenuDO> list(@SanitizeMap Map<String,Object> map);
+	List<RoleMenuDO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

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

@@ -1,15 +1,15 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.UserDO;
 
 import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
+ * 
  * @author xiongxy
  * @email 1179705413@qq.com
  * @date 2019-10-03 09:45:11
@@ -17,23 +17,23 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysUserDao {
 
-    UserDO get(Long userId);
+	UserDO get(Long userId);
+	
+	List<UserDO> list(Map<String,Object> map);
+	
+	int count(Map<String,Object> map);
+	
+	int save(UserDO user);
+	
+	int update(UserDO user);
+	
+	int remove(Long userId);
+	
+	int batchRemove(Long[] userIds);
+	
+	Long[] listAllDept();
 
-    List<UserDO> list(@SanitizeMap Map<String, Object> map);
+    List<UserDO> listByPerm(Map<String, Object> map);
 
-    int count(Map<String, Object> map);
-
-    int save(UserDO user);
-
-    int update(UserDO user);
-
-    int remove(Long userId);
-
-    int batchRemove(Long[] userIds);
-
-    Long[] listAllDept();
-
-    List<UserDO> listByPerm(@SanitizeMap Map<String, Object> map);
-
-    int countByPerm(Map<String, Object> map);
+	int countByPerm(Map<String,Object> map);
 }

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

@@ -1,7 +1,5 @@
 package com.java2nb.system.dao;
 
-import com.java2nb.common.annotation.SanitizeMap;
-
 import com.java2nb.system.domain.UserRoleDO;
 
 import java.util.List;
@@ -21,7 +19,7 @@ public interface UserRoleDao {
 
 	UserRoleDO get(Long id);
 
-	List<UserRoleDO> list(@SanitizeMap Map<String, Object> map);
+	List<UserRoleDO> list(Map<String, Object> map);
 
 	int count(Map<String, Object> map);
 

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

@@ -7,11 +7,92 @@ 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,11 +7,86 @@ 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: test123456
+    password: test
     # 连接超时时间（毫秒）
     timeout: 10000
+    jedis:
+      pool:
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池中的最小空闲连接
+        min-idle: 10
+        # 连接池最大连接数（使用负值表示没有限制）
+        max-active: 100
+        # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1
 
 
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+
+sharding:
+  jdbc:
+    datasource:
+      names: ds0 #,ds1
+      ds0:
+        type: com.zaxxer.hikari.HikariDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        jdbc-url: jdbc:mysql://localhost:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+        username: root
+        password: test123456
+    #      ds1:
+    #        type: com.alibaba.druid.pool.DruidDataSource
+    #        driver-class-name: com.mysql.jdbc.Driver
+    #        url: jdbc:mysql://localhost:3306/novel_plus2
+    #        username: root
+    #        password: test123456
+    config:
+      sharding:
+        props:
+          sql.show: true
+        tables:
+          book_content: #book_content表
+            key-generator-column-name: id  #主键
+            actual-data-nodes: ds${0}.book_content${0..9}  #数据节点
+            #            database-strategy:  #分库策略
+            #              inline:
+            #                sharding-column: book_id
+            #                algorithm-expression: ds${book_id % 10}
+            table-strategy: #分表策略
+              inline:
+                shardingColumn: index_id
+                algorithm-expression: book_content${index_id % 10}

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

@@ -9,9 +9,6 @@ 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
@@ -26,7 +23,10 @@ spring:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
-
+          
+  devtools:
+    restart:
+      enabled: true
   main:
     allow-bean-definition-overriding: true
 
@@ -36,6 +36,9 @@ 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("操作成功，重启 novel-front 后生效");
+                layer.msg("操作成功");
             } 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/common/generator/Dao.java.vm

@@ -18,7 +18,7 @@ public interface ${className}Dao {
 
 	${className}DO get(${pk.javaType} ${pk.attrname});
 	
-	List<${className}DO> list(@SanitizeMap Map<String,Object> map);
+	List<${className}DO> list(Map<String,Object> map);
 	
 	int count(Map<String,Object> map);
 	

novel-admin/src/main/resources/templates/common/generator/Mapper.java.vm

@@ -44,7 +44,7 @@ public interface ${className}Mapper {
 			"limit #{offset}, #{limit}" + 
 			"</if>"+
 			"</script>")
-	List<${className}DO> list(@SanitizeMap Map<String,Object> map);
+	List<${className}DO> list(Map<String,Object> map);
 	
 	@Select("<script>" +
 	"select count(*) from ${tableName} " + 

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/login.html

@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <title>后台管理-登录</title>
+    <title>后台管理-登陆</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta http-equiv="Access-Control-Allow-Origin" content="*">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

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>5.2.3</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,12 +22,6 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
-        <!-- Aop 相关 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -58,16 +52,18 @@
         </dependency>
 
         <!-- 分库分表-->
-        <!-- ShardingSphere-JDBC -->
+        <!-- sharding jdbc依赖 -->
+
         <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>shardingsphere-jdbc</artifactId>
-            <version>${shardingsphere-jdbc.version}</version>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>${sharding.jdbc.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
+            <groupId>io.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <version>${sharding.jdbc.version}</version>
         </dependency>
 
 
@@ -77,6 +73,11 @@
             <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>
@@ -85,8 +86,15 @@
         </dependency>
         <!--httpclient-->
         <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -109,12 +117,6 @@
             <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>
@@ -136,29 +138,5 @@
 
     </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>

novel-common/src/main/java/com/java2nb/novel/core/advice/CommonExceptionHandler.java

@@ -1,55 +0,0 @@
-package com.java2nb.novel.core.advice;
-
-import io.github.xxyopen.model.resp.RestResult;
-import io.github.xxyopen.model.resp.SysResultCode;
-import io.github.xxyopen.web.exception.BusinessException;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.MediaType;
-import org.springframework.validation.BindException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * 统一异常处理器
- *
- * @author xiongxiaoyang
- */
-@Slf4j
-@RestControllerAdvice
-public class CommonExceptionHandler {
-
-    public CommonExceptionHandler() {
-    }
-
-    @ExceptionHandler({BindException.class})
-    public RestResult<Void> handlerBindException(BindException e) {
-        log.error(e.getMessage(), e);
-        return RestResult.fail(SysResultCode.PARAM_ERROR);
-    }
-
-    @ExceptionHandler({BusinessException.class})
-    public RestResult<Void> handlerBusinessException(BusinessException e) {
-        log.error(e.getMessage(), e);
-        return RestResult.fail(e.getResultCode());
-    }
-
-    @ExceptionHandler(Exception.class)
-    public Object handleException(HttpServletRequest request, Exception e) {
-        log.error(e.getMessage(), e);
-        if (isJsonRequest(request)) {
-            // 如果是REST请求，返回JSON格式的错误响应
-            return RestResult.error();
-        } else {
-            //跳转页面过程中出现异常时统一跳转到404页面
-            return new ModelAndView("404");
-        }
-    }
-
-    private boolean isJsonRequest(HttpServletRequest request) {
-        String acceptHeader = request.getHeader("Accept");
-        return acceptHeader != null && acceptHeader.contains(MediaType.APPLICATION_JSON_VALUE);
-    }
-
-}

novel-common/src/main/java/com/java2nb/novel/core/advice/CustomResponseBodyAdvice.java

@@ -1,53 +0,0 @@
-package com.java2nb.novel.core.advice;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import org.springframework.core.MethodParameter;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
-import org.springframework.http.server.ServerHttpRequest;
-import org.springframework.http.server.ServerHttpResponse;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
-
-import java.util.Objects;
-
-/**
- * 在对 RestController 返回对象 json 序列化时，将所有 Long 类型转为 String 类型返回，避免前端数据精度丢失的问题
- * 取代 spring.jackson.generator.write-numbers-as-strings=true 配置，避免影响全局的 ObjectMapper
- *
- * @author xiongxiaoyang
- * */
-@RestControllerAdvice
-public class CustomResponseBodyAdvice implements ResponseBodyAdvice<Object> {
-
-    private final ObjectMapper customObjectMapper;
-
-    public CustomResponseBodyAdvice(Jackson2ObjectMapperBuilder builder) {
-        customObjectMapper = builder.createXmlMapper(false).build();
-        SimpleModule simpleModule = new SimpleModule();
-        simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
-        simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
-        customObjectMapper.registerModule(simpleModule);
-    }
-
-    @Override
-    public boolean supports(MethodParameter returnType, Class<? extends HttpMessageConverter<?>> converterType) {
-        // 返回 true 表示对所有 Controller 的响应都生效
-        return true;
-    }
-
-    @Override
-    public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class<? extends HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
-        // 使用自定义的 ObjectMapper 序列化响应体
-        if(Objects.nonNull(body)) {
-            return customObjectMapper.valueToTree(body);
-        }else{
-            return null;
-        }
-    }
-
-}
-

novel-common/src/main/java/com/java2nb/novel/core/advice/PageExceptionHandler.java

@@ -0,0 +1,26 @@
+package com.java2nb.novel.core.advice;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+/**
+ * 页面异常处理器
+ *
+ * @author 11797
+ */
+@Slf4j
+@ControllerAdvice(basePackages = "com.java2nb.novel.controller.page")
+public class PageExceptionHandler {
+
+
+    /**
+     * 处理所有异常
+     */
+    @ExceptionHandler(Exception.class)
+    public String handlerException(Exception e) {
+        log.error(e.getMessage(), e);
+        //跳转页面过程中出现异常时统一跳转到404页面
+        return "404";
+    }
+}

novel-common/src/main/java/com/java2nb/novel/core/cache/CacheKey.java

@@ -41,6 +41,11 @@ public interface CacheKey {
      * */
     String TEMPLATE_DIR_KEY =  "templateDirKey";;
 
+    /**
+     * 正在运行的爬虫线程存储KEY前缀
+     * */
+    String RUNNING_CRAWL_THREAD_KEY_PREFIX = "runningCrawlTreadDataKeyPrefix";
+
     /**
      * 上一次搜索引擎更新的时间
      * */
@@ -64,8 +69,4 @@ public interface CacheKey {
      * 测试爬虫规则缓存
      */
     String BOOK_TEST_PARSE = "testParse";
-    /**
-     * AI生成图片
-     * */
-    String AI_GEN_PIC = "aiGenPic";
 }

novel-common/src/main/java/com/java2nb/novel/core/config/HttpProxyProperties.java

@@ -19,8 +19,4 @@ public class HttpProxyProperties {
 
     private Integer port;
 
-    private String username;
-
-    private String password;
-
 }

novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java

@@ -18,7 +18,7 @@ public enum ResponseStatus implements IResultCode {
     /**
      * 用户相关错误
      * */
-   NO_LOGIN(1001, "未登录或登录失效！"),
+   NO_LOGIN(1001, "未登录或登陆失效！"),
     VEL_CODE_ERROR(1002, "验证码错误！"),
     USERNAME_EXIST(1003,"该手机号已注册！"),
     USERNAME_PASS_ERROR(1004,"手机号或密码错误！"),

novel-common/src/main/java/com/java2nb/novel/core/utils/DateUtil.java

@@ -106,47 +106,6 @@ public class DateUtil {
     }
 
 
-    /**
-     * 将日期格式化成"多久之前"的格式
-     * */
-    public static String formatTimeAgo(Date date){
-        if (date == null) {
-            return null;
-        }
-
-        long now = new Date().getTime();
-        long then = date.getTime();
-
-        long diff = now - then;
-
-        if (diff < 0) {
-            // 未来时间
-            DateUtil.formatDate(date, DateUtil.DATE_TIME_PATTERN);
-        }
-
-        long seconds = diff / 1000;
-        long minutes = seconds / 60;
-        long hours = minutes / 60;
-        long days = hours / 24;
-        long months = days / 30;
-        long years = months / 12;
-
-        if (seconds < 60) {
-            return "刚刚";
-        } else if (minutes < 60) {
-            return minutes + "分钟前";
-        } else if (hours < 24) {
-            return hours + "小时前";
-        } else if (days < 30) {
-            return days + "天前";
-        } else if (months < 12) {
-            return months + "个月前";
-        } else {
-            return years + "年前";
-        }
-    }
-
-
     public static void main(String[] args) {
         System.out.println(formatDate(getYesterday(),DATE_TIME_PATTERN));
         System.out.println(formatDate(getDateStartTime(getYesterday()),DATE_TIME_PATTERN));

novel-common/src/main/java/com/java2nb/novel/core/utils/FileUtil.java

@@ -5,7 +5,7 @@ import lombok.SneakyThrows;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.Charsets;
-import org.apache.hc.client5.http.utils.DateUtils;
+import org.apache.http.client.utils.DateUtils;
 import org.springframework.core.io.Resource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -14,15 +14,7 @@ import org.springframework.http.ResponseEntity;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
+import java.io.*;
 import java.util.Date;
 import java.util.Objects;
 
@@ -45,13 +37,10 @@ public class FileUtil {
             //本地图片保存
             HttpHeaders headers = new HttpHeaders();
             HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
-            ResponseEntity<Resource> resEntity = RestTemplates.newInstance(Charsets.ISO_8859_1.name())
-                .exchange(picSrc, HttpMethod.GET, requestEntity, Resource.class);
+            ResponseEntity<Resource> resEntity = RestTemplateUtil.getInstance(Charsets.ISO_8859_1.name()).exchange(picSrc, HttpMethod.GET, requestEntity, Resource.class);
             input = Objects.requireNonNull(resEntity.getBody()).getInputStream();
             Date currentDate = new Date();
-            picSrc =
-                visitPrefix + DateUtils.formatDate(currentDate, "yyyy") + "/" + DateUtils.formatDate(currentDate, "MM")
-                    + "/" + DateUtils.formatDate(currentDate, "dd") + "/"
+            picSrc = visitPrefix + DateUtils.formatDate(currentDate, "yyyy") + "/" + DateUtils.formatDate(currentDate, "MM") + "/" + DateUtils.formatDate(currentDate, "dd") + "/"
                     + UUIDUtil.getUUID32()
                     + picSrc.substring(picSrc.lastIndexOf("."));
             File picFile = new File(picSavePath + picSrc);
@@ -78,6 +67,7 @@ public class FileUtil {
             closeStream(input, out);
         }
 
+
         return picSrc;
     }
 
@@ -130,23 +120,5 @@ public class FileUtil {
 
     }
 
-    /**
-     * 下载文件
-     *
-     * @param downloadUrl 下载的URL
-     * @param savePath    保存的路径
-     */
-    @SneakyThrows
-    public void downloadFile(String downloadUrl, String savePath) {
-        Path path = Paths.get(savePath);
-        Path parentPath = path.getParent();
-        if (Files.notExists(parentPath)) {
-            Files.createDirectories(parentPath);
-        }
-        URL url = new URL(downloadUrl);
-        try (InputStream in = url.openStream()) {
-            Files.copy(in, path, StandardCopyOption.REPLACE_EXISTING);
-        }
-    }
 
 }

novel-common/src/main/java/com/java2nb/novel/core/utils/HttpUtil.java

@@ -1,52 +1,47 @@
 package com.java2nb.novel.core.utils;
 
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
-import java.nio.charset.Charset;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 /**
  * @author Administrator
  */
-@Slf4j
 public class HttpUtil {
 
-    private static final String DEFAULT_CHARSET = "utf-8";
+    private static RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");
 
-    private static final Map<String, RestTemplate> REST_TEMPLATE_MAP = new ConcurrentHashMap<>();
 
-    public static String getByHttpClientWithChrome(String url, String charset) {
-        log.debug("Get url：{}", url);
-        if (!Charset.isSupported(charset)) {
-            log.error("字符编码{}无效！", charset);
-            return null;
-        }
-        RestTemplate restTemplate = REST_TEMPLATE_MAP.computeIfAbsent(charset,
-            k -> RestTemplates.newInstance(charset));
+    public static String getByHttpClient(String url) {
         try {
-            HttpHeaders headers = new HttpHeaders();
-            headers.add("user-agent",
-                "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36");
-            HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
-            ResponseEntity<String> forEntity = restTemplate.exchange(url, HttpMethod.GET, requestEntity,
-                String.class);
-            log.debug("Response code：{}", forEntity.getStatusCode());
+
+            ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
             if (forEntity.getStatusCode() == HttpStatus.OK) {
                 return forEntity.getBody();
             } else {
                 return null;
             }
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            e.printStackTrace();
             return null;
         }
     }
 
     public static String getByHttpClientWithChrome(String url) {
-        return getByHttpClientWithChrome(url, DEFAULT_CHARSET);
-    }
+        try {
 
+            HttpHeaders headers = new HttpHeaders();
+            headers.add("user-agent","Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.67 Safari/537.36");
+            HttpEntity<String> requestEntity = new HttpEntity<>(null, headers);
+            ResponseEntity<String> forEntity = restTemplate.exchange(url.toString(), HttpMethod.GET, requestEntity, String.class);
+
+            if (forEntity.getStatusCode() == HttpStatus.OK) {
+                return forEntity.getBody();
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

novel-common/src/main/java/com/java2nb/novel/core/utils/IpUtil.java

@@ -1,21 +1,11 @@
 package com.java2nb.novel.core.utils;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
 
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-
-@Slf4j
 public class IpUtil {
 
     /**
      * 获取真实IP
-     *
      * @param request 请求体
      * @return 真实IP
      */
@@ -41,27 +31,4 @@ public class IpUtil {
         }
         return ip;
     }
-
-    /**
-     * 获取本机公网IP
-     */
-    public static String getPublicIP() {
-        try {
-            HttpClient client = HttpClient.newHttpClient();
-            HttpRequest request = HttpRequest.newBuilder()
-                .uri(URI.create("https://httpbin.org/ip"))
-                .GET()
-                .timeout(Duration.ofSeconds(5))
-                .build();
-
-            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-
-            if (response.statusCode() == 200) {
-                return new ObjectMapper().readTree(response.body()).get("origin").asText();
-            }
-        } catch (Exception e) {
-            log.error("获取本机公网IP异常", e);
-        }
-        return null;
-    }
 }

novel-common/src/main/java/com/java2nb/novel/core/utils/RestTemplateUtil.java

@@ -2,22 +2,17 @@ package com.java2nb.novel.core.utils;
 
 import com.java2nb.novel.core.config.HttpProxyProperties;
 import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.hc.client5.http.auth.AuthScope;
-import org.apache.hc.client5.http.auth.UsernamePasswordCredentials;
-import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
-import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
-import org.apache.hc.client5.http.socket.ConnectionSocketFactory;
-import org.apache.hc.client5.http.socket.PlainConnectionSocketFactory;
-import org.apache.hc.client5.http.ssl.SSLConnectionSocketFactory;
-import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.config.Registry;
-import org.apache.hc.core5.http.config.RegistryBuilder;
-import org.apache.hc.core5.ssl.SSLContexts;
-import org.apache.hc.core5.ssl.TrustStrategy;
+import org.apache.http.HttpHost;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.conn.ssl.TrustStrategy;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
@@ -31,21 +26,21 @@ import java.util.List;
 import java.util.Objects;
 
 @Component
-public class RestTemplates {
+public class RestTemplateUtil {
 
     private static HttpProxyProperties httpProxyProperties;
 
-    RestTemplates(HttpProxyProperties properties) {
+    RestTemplateUtil(HttpProxyProperties properties) {
         httpProxyProperties = properties;
     }
 
     @SneakyThrows
-    public static RestTemplate newInstance(String charset) {
+    public static RestTemplate getInstance(String charset) {
 
         TrustStrategy acceptingTrustStrategy = (X509Certificate[] chain, String authType) -> true;
 
         //忽略证书
-        SSLContext sslContext = SSLContexts.custom()
+        SSLContext sslContext = org.apache.http.ssl.SSLContexts.custom()
             .loadTrustMaterial(null, acceptingTrustStrategy)
             .build();
 
@@ -66,15 +61,6 @@ public class RestTemplates {
         if (Objects.nonNull(httpProxyProperties) && Boolean.TRUE.equals(httpProxyProperties.getEnabled())) {
             HttpHost proxy = new HttpHost(httpProxyProperties.getIp(), httpProxyProperties.getPort());
             clientBuilder.setProxy(proxy);
-            if (StringUtils.isNotBlank(httpProxyProperties.getUsername()) && StringUtils.isNotBlank(
-                httpProxyProperties.getPassword())) {
-                // 创建CredentialsProvider实例并添加代理认证信息
-                BasicCredentialsProvider provider = new BasicCredentialsProvider();
-                UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(
-                    httpProxyProperties.getUsername(), httpProxyProperties.getPassword().toCharArray());
-                provider.setCredentials(new AuthScope(null, -1), credentials);
-                clientBuilder.setDefaultCredentialsProvider(provider);
-            }
         }
         CloseableHttpClient httpClient = clientBuilder.setConnectionManager(connectionManager)
             .build();

novel-common/src/main/java/com/java2nb/novel/core/utils/SpringUtil.java

@@ -1,37 +0,0 @@
-package com.java2nb.novel.core.utils;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-@Component
-public class SpringUtil implements ApplicationContextAware {
-    private static ApplicationContext applicationContext;
-
-    public SpringUtil() {
-    }
-
-    public void setApplicationContext(ApplicationContext applicationContext) {
-        if (SpringUtil.applicationContext == null) {
-            SpringUtil.applicationContext = applicationContext;
-        }
-
-    }
-
-    public static ApplicationContext getApplicationContext() {
-        return applicationContext;
-    }
-
-    public static Object getBean(String name) {
-        return getApplicationContext().getBean(name);
-    }
-
-    public static <T> T getBean(Class<T> clazz) {
-        return (T)getApplicationContext().getBean(clazz);
-    }
-
-    public static <T> T getBean(String name, Class<T> clazz) {
-        return (T)getApplicationContext().getBean(name, clazz);
-    }
-}
-

novel-common/src/main/java/com/java2nb/novel/entity/BookComment.java

@@ -14,9 +14,6 @@ public class BookComment {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private String commentContent;
 
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String location;
-
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Integer replyCount;
 
@@ -59,16 +56,6 @@ public class BookComment {
         this.commentContent = commentContent == null ? null : commentContent.trim();
     }
 
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public String getLocation() {
-        return location;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setLocation(String location) {
-        this.location = location == null ? null : location.trim();
-    }
-
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public Integer getReplyCount() {
         return replyCount;

novel-common/src/main/java/com/java2nb/novel/entity/BookCommentReply.java

@@ -1,97 +0,0 @@
-package com.java2nb.novel.entity;
-
-import java.util.Date;
-import javax.annotation.Generated;
-
-public class BookCommentReply {
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private Long id;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private Long commentId;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String replyContent;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private String location;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private Byte auditStatus;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private Date createTime;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private Long createUserId;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public Long getId() {
-        return id;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public Long getCommentId() {
-        return commentId;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setCommentId(Long commentId) {
-        this.commentId = commentId;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public String getReplyContent() {
-        return replyContent;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setReplyContent(String replyContent) {
-        this.replyContent = replyContent == null ? null : replyContent.trim();
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public String getLocation() {
-        return location;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setLocation(String location) {
-        this.location = location == null ? null : location.trim();
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public Byte getAuditStatus() {
-        return auditStatus;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setAuditStatus(Byte auditStatus) {
-        this.auditStatus = auditStatus;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public Long getCreateUserId() {
-        return createUserId;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setCreateUserId(Long createUserId) {
-        this.createUserId = createUserId;
-    }
-}

novel-common/src/main/java/com/java2nb/novel/entity/CrawlSingleTask.java

@@ -31,9 +31,6 @@ public class CrawlSingleTask {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Byte excCount;
 
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    private Integer crawlChapters;
-
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     private Date createTime;
 
@@ -127,16 +124,6 @@ public class CrawlSingleTask {
         this.excCount = excCount;
     }
 
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public Integer getCrawlChapters() {
-        return crawlChapters;
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public void setCrawlChapters(Integer crawlChapters) {
-        this.crawlChapters = crawlChapters;
-    }
-
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public Date getCreateTime() {
         return createTime;

novel-common/src/main/java/com/java2nb/novel/entity/User.java

@@ -2,9 +2,9 @@ package com.java2nb.novel.entity;
 
 import io.github.xxyopen.web.valid.AddGroup;
 import io.github.xxyopen.web.valid.UpdateGroup;
-import jakarta.validation.constraints.*;
 
 import javax.annotation.Generated;
+import javax.validation.constraints.*;
 import java.util.Date;
 
 public class User {

novel-common/src/main/java/com/java2nb/novel/mapper/BookCommentDynamicSqlSupport.java

@@ -19,9 +19,6 @@ public final class BookCommentDynamicSqlSupport {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<String> commentContent = bookComment.commentContent;
 
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<String> location = bookComment.location;
-
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Integer> replyCount = bookComment.replyCount;
 
@@ -42,8 +39,6 @@ public final class BookCommentDynamicSqlSupport {
 
         public final SqlColumn<String> commentContent = column("comment_content", JDBCType.VARCHAR);
 
-        public final SqlColumn<String> location = column("location", JDBCType.VARCHAR);
-
         public final SqlColumn<Integer> replyCount = column("reply_count", JDBCType.INTEGER);
 
         public final SqlColumn<Byte> auditStatus = column("audit_status", JDBCType.TINYINT);

novel-common/src/main/java/com/java2nb/novel/mapper/BookCommentMapper.java

@@ -29,7 +29,7 @@ import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
 @Mapper
 public interface BookCommentMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, bookId, commentContent, location, replyCount, auditStatus, createTime, createUserId);
+    BasicColumn[] selectList = BasicColumn.columnList(id, bookId, commentContent, replyCount, auditStatus, createTime, createUserId);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
@@ -58,7 +58,6 @@ public interface BookCommentMapper {
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="book_id", property="bookId", jdbcType=JdbcType.BIGINT),
         @Result(column="comment_content", property="commentContent", jdbcType=JdbcType.VARCHAR),
-        @Result(column="location", property="location", jdbcType=JdbcType.VARCHAR),
         @Result(column="reply_count", property="replyCount", jdbcType=JdbcType.INTEGER),
         @Result(column="audit_status", property="auditStatus", jdbcType=JdbcType.TINYINT),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@@ -93,7 +92,6 @@ public interface BookCommentMapper {
             c.map(id).toProperty("id")
             .map(bookId).toProperty("bookId")
             .map(commentContent).toProperty("commentContent")
-            .map(location).toProperty("location")
             .map(replyCount).toProperty("replyCount")
             .map(auditStatus).toProperty("auditStatus")
             .map(createTime).toProperty("createTime")
@@ -107,7 +105,6 @@ public interface BookCommentMapper {
             c.map(id).toProperty("id")
             .map(bookId).toProperty("bookId")
             .map(commentContent).toProperty("commentContent")
-            .map(location).toProperty("location")
             .map(replyCount).toProperty("replyCount")
             .map(auditStatus).toProperty("auditStatus")
             .map(createTime).toProperty("createTime")
@@ -121,7 +118,6 @@ public interface BookCommentMapper {
             c.map(id).toPropertyWhenPresent("id", record::getId)
             .map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
             .map(commentContent).toPropertyWhenPresent("commentContent", record::getCommentContent)
-            .map(location).toPropertyWhenPresent("location", record::getLocation)
             .map(replyCount).toPropertyWhenPresent("replyCount", record::getReplyCount)
             .map(auditStatus).toPropertyWhenPresent("auditStatus", record::getAuditStatus)
             .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
@@ -161,7 +157,6 @@ public interface BookCommentMapper {
         return dsl.set(id).equalTo(record::getId)
                 .set(bookId).equalTo(record::getBookId)
                 .set(commentContent).equalTo(record::getCommentContent)
-                .set(location).equalTo(record::getLocation)
                 .set(replyCount).equalTo(record::getReplyCount)
                 .set(auditStatus).equalTo(record::getAuditStatus)
                 .set(createTime).equalTo(record::getCreateTime)
@@ -173,7 +168,6 @@ public interface BookCommentMapper {
         return dsl.set(id).equalToWhenPresent(record::getId)
                 .set(bookId).equalToWhenPresent(record::getBookId)
                 .set(commentContent).equalToWhenPresent(record::getCommentContent)
-                .set(location).equalToWhenPresent(record::getLocation)
                 .set(replyCount).equalToWhenPresent(record::getReplyCount)
                 .set(auditStatus).equalToWhenPresent(record::getAuditStatus)
                 .set(createTime).equalToWhenPresent(record::getCreateTime)
@@ -185,7 +179,6 @@ public interface BookCommentMapper {
         return update(c ->
             c.set(bookId).equalTo(record::getBookId)
             .set(commentContent).equalTo(record::getCommentContent)
-            .set(location).equalTo(record::getLocation)
             .set(replyCount).equalTo(record::getReplyCount)
             .set(auditStatus).equalTo(record::getAuditStatus)
             .set(createTime).equalTo(record::getCreateTime)
@@ -199,7 +192,6 @@ public interface BookCommentMapper {
         return update(c ->
             c.set(bookId).equalToWhenPresent(record::getBookId)
             .set(commentContent).equalToWhenPresent(record::getCommentContent)
-            .set(location).equalToWhenPresent(record::getLocation)
             .set(replyCount).equalToWhenPresent(record::getReplyCount)
             .set(auditStatus).equalToWhenPresent(record::getAuditStatus)
             .set(createTime).equalToWhenPresent(record::getCreateTime)

novel-common/src/main/java/com/java2nb/novel/mapper/BookCommentReplyDynamicSqlSupport.java

@@ -1,54 +0,0 @@
-package com.java2nb.novel.mapper;
-
-import java.sql.JDBCType;
-import java.util.Date;
-import javax.annotation.Generated;
-import org.mybatis.dynamic.sql.SqlColumn;
-import org.mybatis.dynamic.sql.SqlTable;
-
-public final class BookCommentReplyDynamicSqlSupport {
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final BookCommentReply bookCommentReply = new BookCommentReply();
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<Long> id = bookCommentReply.id;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<Long> commentId = bookCommentReply.commentId;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<String> replyContent = bookCommentReply.replyContent;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<String> location = bookCommentReply.location;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<Byte> auditStatus = bookCommentReply.auditStatus;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<Date> createTime = bookCommentReply.createTime;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<Long> createUserId = bookCommentReply.createUserId;
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final class BookCommentReply extends SqlTable {
-        public final SqlColumn<Long> id = column("id", JDBCType.BIGINT);
-
-        public final SqlColumn<Long> commentId = column("comment_id", JDBCType.BIGINT);
-
-        public final SqlColumn<String> replyContent = column("reply_content", JDBCType.VARCHAR);
-
-        public final SqlColumn<String> location = column("location", JDBCType.VARCHAR);
-
-        public final SqlColumn<Byte> auditStatus = column("audit_status", JDBCType.TINYINT);
-
-        public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
-
-        public final SqlColumn<Long> createUserId = column("create_user_id", JDBCType.BIGINT);
-
-        public BookCommentReply() {
-            super("book_comment_reply");
-        }
-    }
-}

novel-common/src/main/java/com/java2nb/novel/mapper/BookCommentReplyMapper.java

@@ -1,208 +0,0 @@
-package com.java2nb.novel.mapper;
-
-import static com.java2nb.novel.mapper.BookCommentReplyDynamicSqlSupport.*;
-import static org.mybatis.dynamic.sql.SqlBuilder.*;
-
-import com.java2nb.novel.entity.BookCommentReply;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import javax.annotation.Generated;
-import org.apache.ibatis.annotations.DeleteProvider;
-import org.apache.ibatis.annotations.InsertProvider;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Result;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectProvider;
-import org.apache.ibatis.annotations.UpdateProvider;
-import org.apache.ibatis.type.JdbcType;
-import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
-import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
-import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
-import org.mybatis.dynamic.sql.select.CountDSLCompleter;
-import org.mybatis.dynamic.sql.select.SelectDSLCompleter;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.update.UpdateDSL;
-import org.mybatis.dynamic.sql.update.UpdateDSLCompleter;
-import org.mybatis.dynamic.sql.update.UpdateModel;
-import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
-import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
-import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
-
-@Mapper
-public interface BookCommentReplyMapper {
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, commentId, replyContent, location, auditStatus, createTime, createUserId);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    long count(SelectStatementProvider selectStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @DeleteProvider(type=SqlProviderAdapter.class, method="delete")
-    int delete(DeleteStatementProvider deleteStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @InsertProvider(type=SqlProviderAdapter.class, method="insert")
-    int insert(InsertStatementProvider<BookCommentReply> insertStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @InsertProvider(type=SqlProviderAdapter.class, method="insertMultiple")
-    int insertMultiple(MultiRowInsertStatementProvider<BookCommentReply> multipleInsertStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @ResultMap("BookCommentReplyResult")
-    Optional<BookCommentReply> selectOne(SelectStatementProvider selectStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @SelectProvider(type=SqlProviderAdapter.class, method="select")
-    @Results(id="BookCommentReplyResult", value = {
-        @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
-        @Result(column="comment_id", property="commentId", jdbcType=JdbcType.BIGINT),
-        @Result(column="reply_content", property="replyContent", jdbcType=JdbcType.VARCHAR),
-        @Result(column="location", property="location", jdbcType=JdbcType.VARCHAR),
-        @Result(column="audit_status", property="auditStatus", jdbcType=JdbcType.TINYINT),
-        @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="create_user_id", property="createUserId", jdbcType=JdbcType.BIGINT)
-    })
-    List<BookCommentReply> selectMany(SelectStatementProvider selectStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    @UpdateProvider(type=SqlProviderAdapter.class, method="update")
-    int update(UpdateStatementProvider updateStatement);
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default long count(CountDSLCompleter completer) {
-        return MyBatis3Utils.countFrom(this::count, bookCommentReply, completer);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int delete(DeleteDSLCompleter completer) {
-        return MyBatis3Utils.deleteFrom(this::delete, bookCommentReply, completer);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int deleteByPrimaryKey(Long id_) {
-        return delete(c -> 
-            c.where(id, isEqualTo(id_))
-        );
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int insert(BookCommentReply record) {
-        return MyBatis3Utils.insert(this::insert, record, bookCommentReply, c ->
-            c.map(id).toProperty("id")
-            .map(commentId).toProperty("commentId")
-            .map(replyContent).toProperty("replyContent")
-            .map(location).toProperty("location")
-            .map(auditStatus).toProperty("auditStatus")
-            .map(createTime).toProperty("createTime")
-            .map(createUserId).toProperty("createUserId")
-        );
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int insertMultiple(Collection<BookCommentReply> records) {
-        return MyBatis3Utils.insertMultiple(this::insertMultiple, records, bookCommentReply, c ->
-            c.map(id).toProperty("id")
-            .map(commentId).toProperty("commentId")
-            .map(replyContent).toProperty("replyContent")
-            .map(location).toProperty("location")
-            .map(auditStatus).toProperty("auditStatus")
-            .map(createTime).toProperty("createTime")
-            .map(createUserId).toProperty("createUserId")
-        );
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int insertSelective(BookCommentReply record) {
-        return MyBatis3Utils.insert(this::insert, record, bookCommentReply, c ->
-            c.map(id).toPropertyWhenPresent("id", record::getId)
-            .map(commentId).toPropertyWhenPresent("commentId", record::getCommentId)
-            .map(replyContent).toPropertyWhenPresent("replyContent", record::getReplyContent)
-            .map(location).toPropertyWhenPresent("location", record::getLocation)
-            .map(auditStatus).toPropertyWhenPresent("auditStatus", record::getAuditStatus)
-            .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
-            .map(createUserId).toPropertyWhenPresent("createUserId", record::getCreateUserId)
-        );
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default Optional<BookCommentReply> selectOne(SelectDSLCompleter completer) {
-        return MyBatis3Utils.selectOne(this::selectOne, selectList, bookCommentReply, completer);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default List<BookCommentReply> select(SelectDSLCompleter completer) {
-        return MyBatis3Utils.selectList(this::selectMany, selectList, bookCommentReply, completer);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default List<BookCommentReply> selectDistinct(SelectDSLCompleter completer) {
-        return MyBatis3Utils.selectDistinct(this::selectMany, selectList, bookCommentReply, completer);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default Optional<BookCommentReply> selectByPrimaryKey(Long id_) {
-        return selectOne(c ->
-            c.where(id, isEqualTo(id_))
-        );
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int update(UpdateDSLCompleter completer) {
-        return MyBatis3Utils.update(this::update, bookCommentReply, completer);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    static UpdateDSL<UpdateModel> updateAllColumns(BookCommentReply record, UpdateDSL<UpdateModel> dsl) {
-        return dsl.set(id).equalTo(record::getId)
-                .set(commentId).equalTo(record::getCommentId)
-                .set(replyContent).equalTo(record::getReplyContent)
-                .set(location).equalTo(record::getLocation)
-                .set(auditStatus).equalTo(record::getAuditStatus)
-                .set(createTime).equalTo(record::getCreateTime)
-                .set(createUserId).equalTo(record::getCreateUserId);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    static UpdateDSL<UpdateModel> updateSelectiveColumns(BookCommentReply record, UpdateDSL<UpdateModel> dsl) {
-        return dsl.set(id).equalToWhenPresent(record::getId)
-                .set(commentId).equalToWhenPresent(record::getCommentId)
-                .set(replyContent).equalToWhenPresent(record::getReplyContent)
-                .set(location).equalToWhenPresent(record::getLocation)
-                .set(auditStatus).equalToWhenPresent(record::getAuditStatus)
-                .set(createTime).equalToWhenPresent(record::getCreateTime)
-                .set(createUserId).equalToWhenPresent(record::getCreateUserId);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int updateByPrimaryKey(BookCommentReply record) {
-        return update(c ->
-            c.set(commentId).equalTo(record::getCommentId)
-            .set(replyContent).equalTo(record::getReplyContent)
-            .set(location).equalTo(record::getLocation)
-            .set(auditStatus).equalTo(record::getAuditStatus)
-            .set(createTime).equalTo(record::getCreateTime)
-            .set(createUserId).equalTo(record::getCreateUserId)
-            .where(id, isEqualTo(record::getId))
-        );
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int updateByPrimaryKeySelective(BookCommentReply record) {
-        return update(c ->
-            c.set(commentId).equalToWhenPresent(record::getCommentId)
-            .set(replyContent).equalToWhenPresent(record::getReplyContent)
-            .set(location).equalToWhenPresent(record::getLocation)
-            .set(auditStatus).equalToWhenPresent(record::getAuditStatus)
-            .set(createTime).equalToWhenPresent(record::getCreateTime)
-            .set(createUserId).equalToWhenPresent(record::getCreateUserId)
-            .where(id, isEqualTo(record::getId))
-        );
-    }
-}

novel-common/src/main/java/com/java2nb/novel/mapper/CrawlSingleTaskDynamicSqlSupport.java

@@ -37,9 +37,6 @@ public final class CrawlSingleTaskDynamicSqlSupport {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Byte> excCount = crawlSingleTask.excCount;
 
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    public static final SqlColumn<Integer> crawlChapters = crawlSingleTask.crawlChapters;
-
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     public static final SqlColumn<Date> createTime = crawlSingleTask.createTime;
 
@@ -63,8 +60,6 @@ public final class CrawlSingleTaskDynamicSqlSupport {
 
         public final SqlColumn<Byte> excCount = column("exc_count", JDBCType.TINYINT);
 
-        public final SqlColumn<Integer> crawlChapters = column("crawl_chapters", JDBCType.INTEGER);
-
         public final SqlColumn<Date> createTime = column("create_time", JDBCType.TIMESTAMP);
 
         public CrawlSingleTask() {

novel-common/src/main/java/com/java2nb/novel/mapper/CrawlSingleTaskMapper.java

@@ -35,7 +35,7 @@ import org.mybatis.dynamic.sql.util.mybatis3.MyBatis3Utils;
 @Mapper
 public interface CrawlSingleTaskMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    BasicColumn[] selectList = BasicColumn.columnList(id, sourceId, sourceName, sourceBookId, catId, bookName, authorName, taskStatus, excCount, crawlChapters, createTime);
+    BasicColumn[] selectList = BasicColumn.columnList(id, sourceId, sourceName, sourceBookId, catId, bookName, authorName, taskStatus, excCount, createTime);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
@@ -70,7 +70,6 @@ public interface CrawlSingleTaskMapper {
         @Result(column="author_name", property="authorName", jdbcType=JdbcType.VARCHAR),
         @Result(column="task_status", property="taskStatus", jdbcType=JdbcType.TINYINT),
         @Result(column="exc_count", property="excCount", jdbcType=JdbcType.TINYINT),
-        @Result(column="crawl_chapters", property="crawlChapters", jdbcType=JdbcType.INTEGER),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP)
     })
     List<CrawlSingleTask> selectMany(SelectStatementProvider selectStatement);
@@ -91,7 +90,7 @@ public interface CrawlSingleTaskMapper {
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     default int deleteByPrimaryKey(Long id_) {
-        return delete(c ->
+        return delete(c -> 
             c.where(id, isEqualTo(id_))
         );
     }
@@ -100,16 +99,15 @@ public interface CrawlSingleTaskMapper {
     default int insert(CrawlSingleTask record) {
         return MyBatis3Utils.insert(this::insert, record, crawlSingleTask, c ->
             c.map(id).toProperty("id")
-                .map(sourceId).toProperty("sourceId")
-                .map(sourceName).toProperty("sourceName")
-                .map(sourceBookId).toProperty("sourceBookId")
-                .map(catId).toProperty("catId")
-                .map(bookName).toProperty("bookName")
-                .map(authorName).toProperty("authorName")
-                .map(taskStatus).toProperty("taskStatus")
-                .map(excCount).toProperty("excCount")
-                .map(crawlChapters).toProperty("crawlChapters")
-                .map(createTime).toProperty("createTime")
+            .map(sourceId).toProperty("sourceId")
+            .map(sourceName).toProperty("sourceName")
+            .map(sourceBookId).toProperty("sourceBookId")
+            .map(catId).toProperty("catId")
+            .map(bookName).toProperty("bookName")
+            .map(authorName).toProperty("authorName")
+            .map(taskStatus).toProperty("taskStatus")
+            .map(excCount).toProperty("excCount")
+            .map(createTime).toProperty("createTime")
         );
     }
 
@@ -117,16 +115,15 @@ public interface CrawlSingleTaskMapper {
     default int insertMultiple(Collection<CrawlSingleTask> records) {
         return MyBatis3Utils.insertMultiple(this::insertMultiple, records, crawlSingleTask, c ->
             c.map(id).toProperty("id")
-                .map(sourceId).toProperty("sourceId")
-                .map(sourceName).toProperty("sourceName")
-                .map(sourceBookId).toProperty("sourceBookId")
-                .map(catId).toProperty("catId")
-                .map(bookName).toProperty("bookName")
-                .map(authorName).toProperty("authorName")
-                .map(taskStatus).toProperty("taskStatus")
-                .map(excCount).toProperty("excCount")
-                .map(crawlChapters).toProperty("crawlChapters")
-                .map(createTime).toProperty("createTime")
+            .map(sourceId).toProperty("sourceId")
+            .map(sourceName).toProperty("sourceName")
+            .map(sourceBookId).toProperty("sourceBookId")
+            .map(catId).toProperty("catId")
+            .map(bookName).toProperty("bookName")
+            .map(authorName).toProperty("authorName")
+            .map(taskStatus).toProperty("taskStatus")
+            .map(excCount).toProperty("excCount")
+            .map(createTime).toProperty("createTime")
         );
     }
 
@@ -134,16 +131,15 @@ public interface CrawlSingleTaskMapper {
     default int insertSelective(CrawlSingleTask record) {
         return MyBatis3Utils.insert(this::insert, record, crawlSingleTask, c ->
             c.map(id).toPropertyWhenPresent("id", record::getId)
-                .map(sourceId).toPropertyWhenPresent("sourceId", record::getSourceId)
-                .map(sourceName).toPropertyWhenPresent("sourceName", record::getSourceName)
-                .map(sourceBookId).toPropertyWhenPresent("sourceBookId", record::getSourceBookId)
-                .map(catId).toPropertyWhenPresent("catId", record::getCatId)
-                .map(bookName).toPropertyWhenPresent("bookName", record::getBookName)
-                .map(authorName).toPropertyWhenPresent("authorName", record::getAuthorName)
-                .map(taskStatus).toPropertyWhenPresent("taskStatus", record::getTaskStatus)
-                .map(excCount).toPropertyWhenPresent("excCount", record::getExcCount)
-                .map(crawlChapters).toPropertyWhenPresent("crawlChapters", record::getCrawlChapters)
-                .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
+            .map(sourceId).toPropertyWhenPresent("sourceId", record::getSourceId)
+            .map(sourceName).toPropertyWhenPresent("sourceName", record::getSourceName)
+            .map(sourceBookId).toPropertyWhenPresent("sourceBookId", record::getSourceBookId)
+            .map(catId).toPropertyWhenPresent("catId", record::getCatId)
+            .map(bookName).toPropertyWhenPresent("bookName", record::getBookName)
+            .map(authorName).toPropertyWhenPresent("authorName", record::getAuthorName)
+            .map(taskStatus).toPropertyWhenPresent("taskStatus", record::getTaskStatus)
+            .map(excCount).toPropertyWhenPresent("excCount", record::getExcCount)
+            .map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
         );
     }
 
@@ -177,37 +173,7 @@ public interface CrawlSingleTaskMapper {
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     static UpdateDSL<UpdateModel> updateAllColumns(CrawlSingleTask record, UpdateDSL<UpdateModel> dsl) {
         return dsl.set(id).equalTo(record::getId)
-            .set(sourceId).equalTo(record::getSourceId)
-            .set(sourceName).equalTo(record::getSourceName)
-            .set(sourceBookId).equalTo(record::getSourceBookId)
-            .set(catId).equalTo(record::getCatId)
-            .set(bookName).equalTo(record::getBookName)
-            .set(authorName).equalTo(record::getAuthorName)
-            .set(taskStatus).equalTo(record::getTaskStatus)
-            .set(excCount).equalTo(record::getExcCount)
-            .set(crawlChapters).equalTo(record::getCrawlChapters)
-            .set(createTime).equalTo(record::getCreateTime);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    static UpdateDSL<UpdateModel> updateSelectiveColumns(CrawlSingleTask record, UpdateDSL<UpdateModel> dsl) {
-        return dsl.set(id).equalToWhenPresent(record::getId)
-            .set(sourceId).equalToWhenPresent(record::getSourceId)
-            .set(sourceName).equalToWhenPresent(record::getSourceName)
-            .set(sourceBookId).equalToWhenPresent(record::getSourceBookId)
-            .set(catId).equalToWhenPresent(record::getCatId)
-            .set(bookName).equalToWhenPresent(record::getBookName)
-            .set(authorName).equalToWhenPresent(record::getAuthorName)
-            .set(taskStatus).equalToWhenPresent(record::getTaskStatus)
-            .set(excCount).equalToWhenPresent(record::getExcCount)
-            .set(crawlChapters).equalToWhenPresent(record::getCrawlChapters)
-            .set(createTime).equalToWhenPresent(record::getCreateTime);
-    }
-
-    @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int updateByPrimaryKey(CrawlSingleTask record) {
-        return update(c ->
-            c.set(sourceId).equalTo(record::getSourceId)
+                .set(sourceId).equalTo(record::getSourceId)
                 .set(sourceName).equalTo(record::getSourceName)
                 .set(sourceBookId).equalTo(record::getSourceBookId)
                 .set(catId).equalTo(record::getCatId)
@@ -215,16 +181,13 @@ public interface CrawlSingleTaskMapper {
                 .set(authorName).equalTo(record::getAuthorName)
                 .set(taskStatus).equalTo(record::getTaskStatus)
                 .set(excCount).equalTo(record::getExcCount)
-                .set(crawlChapters).equalTo(record::getCrawlChapters)
-                .set(createTime).equalTo(record::getCreateTime)
-                .where(id, isEqualTo(record::getId))
-        );
+                .set(createTime).equalTo(record::getCreateTime);
     }
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
-    default int updateByPrimaryKeySelective(CrawlSingleTask record) {
-        return update(c ->
-            c.set(sourceId).equalToWhenPresent(record::getSourceId)
+    static UpdateDSL<UpdateModel> updateSelectiveColumns(CrawlSingleTask record, UpdateDSL<UpdateModel> dsl) {
+        return dsl.set(id).equalToWhenPresent(record::getId)
+                .set(sourceId).equalToWhenPresent(record::getSourceId)
                 .set(sourceName).equalToWhenPresent(record::getSourceName)
                 .set(sourceBookId).equalToWhenPresent(record::getSourceBookId)
                 .set(catId).equalToWhenPresent(record::getCatId)
@@ -232,9 +195,38 @@ public interface CrawlSingleTaskMapper {
                 .set(authorName).equalToWhenPresent(record::getAuthorName)
                 .set(taskStatus).equalToWhenPresent(record::getTaskStatus)
                 .set(excCount).equalToWhenPresent(record::getExcCount)
-                .set(crawlChapters).equalToWhenPresent(record::getCrawlChapters)
-                .set(createTime).equalToWhenPresent(record::getCreateTime)
-                .where(id, isEqualTo(record::getId))
+                .set(createTime).equalToWhenPresent(record::getCreateTime);
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int updateByPrimaryKey(CrawlSingleTask record) {
+        return update(c ->
+            c.set(sourceId).equalTo(record::getSourceId)
+            .set(sourceName).equalTo(record::getSourceName)
+            .set(sourceBookId).equalTo(record::getSourceBookId)
+            .set(catId).equalTo(record::getCatId)
+            .set(bookName).equalTo(record::getBookName)
+            .set(authorName).equalTo(record::getAuthorName)
+            .set(taskStatus).equalTo(record::getTaskStatus)
+            .set(excCount).equalTo(record::getExcCount)
+            .set(createTime).equalTo(record::getCreateTime)
+            .where(id, isEqualTo(record::getId))
+        );
+    }
+
+    @Generated("org.mybatis.generator.api.MyBatisGenerator")
+    default int updateByPrimaryKeySelective(CrawlSingleTask record) {
+        return update(c ->
+            c.set(sourceId).equalToWhenPresent(record::getSourceId)
+            .set(sourceName).equalToWhenPresent(record::getSourceName)
+            .set(sourceBookId).equalToWhenPresent(record::getSourceBookId)
+            .set(catId).equalToWhenPresent(record::getCatId)
+            .set(bookName).equalToWhenPresent(record::getBookName)
+            .set(authorName).equalToWhenPresent(record::getAuthorName)
+            .set(taskStatus).equalToWhenPresent(record::getTaskStatus)
+            .set(excCount).equalToWhenPresent(record::getExcCount)
+            .set(createTime).equalToWhenPresent(record::getCreateTime)
+            .where(id, isEqualTo(record::getId))
         );
     }
 }

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

@@ -1,18 +1,71 @@
 spring:
-  config:
-    import: classpath:application-common.yml
+  profiles:
+    include: [ common ]
   main:
     allow-bean-definition-overriding: true
   #Redis服务器IP
-  data:
-    redis:
-      host: 127.0.0.1
-      #Redis服务器连接端口
-      port: 6379
-      #Redis服务器连接密码
-      password: test123456
-      #连接超时时间（毫秒）
-      timeout: 10000
+  redis:
+    host: 127.0.0.1
+    #Redis服务器连接端口
+    port: 6379
+    #Redis服务器连接密码
+    password: test123456
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 8
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 1
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8
+        #连接池中的最小空闲连接
+        min-idle: 0
+    #连接超时时间（毫秒）
+    timeout: 30000
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+####使用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}
+
 
 content:
   save:
@@ -25,10 +78,6 @@ http:
     # 是否开启 HTTP 代理，true-开启，false-不开启
     enabled: false
     # 代理 IP
-    ip: us.swiftproxy.net
+    ip: u493.kdltps.com
     # 代理端口号
-    port: 7878
-    # 代理用户名
-    username: swiftproxy_u
-    # 代理密码
-    password: swiftproxy_p
+    port: 15818

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

@@ -1,18 +1,71 @@
 spring:
-  config:
-    import: classpath:application-common.yml
+  profiles:
+    include: [ common ]
   main:
     allow-bean-definition-overriding: true
-  data:
-    redis:
-      #Redis服务器IP
-      host: 127.0.0.1
-      #Redis服务器连接端口
-      port: 6379
-      #Redis服务器连接密码
-      password: test123456
-      #连接超时时间（毫秒）
-      timeout: 10000
+  #Redis服务器IP
+  redis:
+    host: 127.0.0.1
+    #Redis服务器连接端口
+    port: 6379
+    #Redis服务器连接密码
+    password: test
+    jedis:
+      pool:
+        #连接池最大连接数（使用负值表示没有限制）
+        max-active: 8
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: 1
+        #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8
+        #连接池中的最小空闲连接
+        min-idle: 0
+    #连接超时时间（毫秒）
+    timeout: 30000
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/novel_biz?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: test123456
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+
+####使用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}
+
 
 logging:
   level:

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

@@ -1,11 +1,16 @@
 spring:
-  datasource:
-    url: jdbc:shardingsphere:absolutepath:${user.dir}/config/shardingsphere-jdbc.yml
-    driver-class-name: org.apache.shardingsphere.driver.ShardingSphereDriver
+  cache:
+    ehcache:
+      config: classpath:ehcache.xml
   thymeleaf:
     mode: LEGACYHTML5 #去除thymeleaf的html严格校验thymeleaf.mode=LEGACYHTML5
     cache: false # 是否开启模板缓存，默认true,建议在开发时关闭缓存,不然没法看到实时
 
+  # 将所有数字转为 String 类型返回，避免前端数据精度丢失的问题
+  jackson:
+    generator:
+      write-numbers-as-strings: true
+
   #上传文件的最大值（100M）
   servlet:
     multipart:
@@ -22,8 +27,6 @@ mybatis:
 logging:
   config: classpath:logback-boot.xml
 
-pagehelper:
-  helper-dialect: mysql
 
 
 

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.2.3</version>
+        <version>4.3.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,12 +21,6 @@
             <artifactId>novel-common</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>2.2</version>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -35,6 +29,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
         </dependency>
 
 

novel-crawl/src/main/build/config/application-common-prod.yml

@@ -0,0 +1,53 @@
+#端口号
+server:
+  port: 8083
+
+#不分表的数据库配置
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password: test123456
+
+####使用shardingJdbc时，
+####所有的jdbcType都不能是LONGVARCHAR,否则会导致java.io.NotSerializableException: java.io.StringReader错误
+##### 应该替换所有的 LONGVARCHAR 类型为VARCHAR
+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
+
+#登录用户名密码
+admin:
+  username: admin
+  password: admin
+#
+##爬虫自动更新的线程数
+##建议小说数量不多或者正在运行新书入库爬虫的情况下设置为1即可
+##随着小说数量的增多可以逐渐增加，但建议不要超出CPU的线程数
+crawl:
+  update:
+    thread: 1
+
+#小说内容保存配置
+content:
+  save:
+    storage: db # 小说内容存储方式：db-数据库，txt-TXT文本
+    path: /Users/xiongxiaoyang/books  # 小说TXT文本保存路径
+
+# HTTP 代理配置
+http:
+  proxy:
+    # 是否开启 HTTP 代理，true-开启，false-不开启
+    enabled: false
+    # 代理 IP
+    ip: u493.kdltps.com
+    # 代理端口号
+    port: 15818

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

@@ -1,47 +0,0 @@
-#端口号
-server:
-  port: 8083
-
-spring:
-  data:
-    redis:
-      #Redis服务器IP
-      host: 127.0.0.1
-      #Redis服务器连接端口
-      port: 6379
-      #Redis服务器连接密码
-      password: test123456
-      #连接超时时间（毫秒）
-      timeout: 10000
-
-#登录用户名密码
-admin:
-  username: admin
-  password: admin
-#
-##爬虫自动更新的线程数
-##建议小说数量不多或者正在运行新书入库爬虫的情况下设置为1即可
-##随着小说数量的增多可以逐渐增加，但建议不要超出CPU的线程数
-crawl:
-  update:
-    thread: 1
-
-#小说内容保存配置
-content:
-  save:
-    storage: db # 小说内容存储方式：db-数据库，txt-TXT文本
-    path: /Users/xiongxiaoyang/books  # 小说TXT文本保存路径
-
-# HTTP 代理配置
-http:
-  proxy:
-    # 是否开启 HTTP 代理，true-开启，false-不开启
-    enabled: false
-    # 代理 IP
-    ip: us.swiftproxy.net
-    # 代理端口号
-    port: 7878
-    # 代理用户名
-    username: swiftproxy_u
-    # 代理密码
-    password: swiftproxy_p

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

@@ -1,47 +0,0 @@
-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-crawl/src/main/java/com/java2nb/novel/controller/CrawlController.java

@@ -153,14 +153,6 @@ public class CrawlController {
         return RestResult.ok();
     }
 
-    /**
-     * 采集任务进度查询
-     * */
-    @GetMapping("getTaskProgress/{id}")
-    public RestResult<Integer> getTaskProgress(@PathVariable("id") Long id){
-        return RestResult.ok(crawlService.getTaskProgress(id));
-    }
-
 
 
 

novel-crawl/src/main/java/com/java2nb/novel/core/config/SecurityConfiguration.java

@@ -4,15 +4,14 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.provisioning.InMemoryUserDetailsManager;
-import org.springframework.security.web.SecurityFilterChain;
 
 /**
  * SpringSecurity配置
@@ -22,7 +21,7 @@ import org.springframework.security.web.SecurityFilterChain;
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor
-public class SecurityConfiguration {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
     @Value("${admin.username}")
     private String username;
@@ -30,40 +29,39 @@ public class SecurityConfiguration {
     @Value("${admin.password}")
     private String password;
 
+
     @Bean
     public PasswordEncoder passwordEncoder() {
         return new BCryptPasswordEncoder();
     }
 
-    @Bean
-    public InMemoryUserDetailsManager userDetailsService() {
-        UserDetails admin = User.builder()
-                .username(username)
-                .password(passwordEncoder().encode(password))
-                .roles("ADMIN")
-                .build();
-        return new InMemoryUserDetailsManager(admin);
+
+    @Override
+    public void configure(WebSecurity web) throws Exception {
+        super.configure(web);
     }
 
-    @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        http
-                .csrf(csrf -> csrf.disable()) // 禁用 CSRF
-                .authorizeHttpRequests(auth -> auth
-                        .requestMatchers("/css/**", "/favicon.ico").permitAll() // 允许访问静态资源
-                        .anyRequest().hasRole("ADMIN") // 其他请求需要 ADMIN 角色
-                )
-                .formLogin(form -> form
-                        .loginPage("/login.html") // 自定义登录页面
-                        .loginProcessingUrl("/login") // 登录处理 URL
-                        .permitAll()
-                )
-                .logout(logout -> logout
-                        .logoutUrl("/logout") // 登出 URL
-                        .logoutSuccessUrl("/") // 登出成功后跳转的页面
-                )
-                .httpBasic(Customizer.withDefaults()); // 启用 HTTP Basic 认证
+    @Override
+    public void configure(AuthenticationManagerBuilder auth) throws Exception {
 
-        return http.build();
+        User.UserBuilder builder = User.builder().passwordEncoder(passwordEncoder()::encode);
+        auth.inMemoryAuthentication().withUser(builder.username(username).password(password).roles("ADMIN").build());
     }
-}
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable()
+            .authorizeRequests()
+            .antMatchers("/css/**").permitAll()
+            .antMatchers("/favicon.ico").permitAll()
+            .antMatchers("/**").hasRole("ADMIN")
+            .and().formLogin().loginPage("/login.html").loginProcessingUrl("/login").permitAll()
+            .and().logout()
+            .logoutUrl("/logout")
+            .logoutSuccessUrl("/")
+            .and().httpBasic();
+
+    }
+
+
+}

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlBookHandler.java

@@ -7,6 +7,6 @@ import com.java2nb.novel.entity.Book;
  * */
 public interface CrawlBookHandler {
 
-    void handle(Book book) throws InterruptedException;
+    void handle(Book book);
 
 }

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/CrawlParser.java

@@ -1,22 +1,21 @@
 package com.java2nb.novel.core.crawl;
 
+import com.java2nb.novel.core.utils.HttpUtil;
 import com.java2nb.novel.core.utils.RandomBookInfoUtil;
+import com.java2nb.novel.core.utils.RestTemplateUtil;
 import com.java2nb.novel.core.utils.StringUtil;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookContent;
 import com.java2nb.novel.entity.BookIndex;
-import com.java2nb.novel.entity.CrawlSingleTask;
 import com.java2nb.novel.utils.Constants;
-import com.java2nb.novel.utils.CrawlHttpClient;
 import io.github.xxyopen.util.IdWorker;
-import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Component;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -28,59 +27,19 @@ import java.util.regex.Pattern;
  * @author Administrator
  */
 @Slf4j
-@Component
-@RequiredArgsConstructor
 public class CrawlParser {
 
-    private final IdWorker ID_WORKER = IdWorker.INSTANCE;
+    private static final IdWorker idWorker = IdWorker.INSTANCE;
 
-    private final CrawlHttpClient crawlHttpClient;
+    private static final RestTemplate restTemplate = RestTemplateUtil.getInstance("utf-8");
 
-    private final StringRedisTemplate stringRedisTemplate;
+    private static final ThreadLocal<Integer> retryCount = new ThreadLocal<>();
 
-    /**
-     * 爬虫源采集章节数量缓存key
-     */
-    private static final String CRAWL_SOURCE_CHAPTER_COUNT_CACHE_KEY = "crawlSource:chapterCount:";
-
-    /**
-     * 爬虫任务进度
-     */
-    private final Map<Long, Integer> crawlTaskProgress = new HashMap<>();
-
-    /**
-     * 获取爬虫任务进度
-     */
-    public Integer getCrawlTaskProgress(Long taskId) {
-        return crawlTaskProgress.get(taskId);
-    }
-
-    /**
-     * 移除爬虫任务进度
-     */
-    public void removeCrawlTaskProgress(Long taskId) {
-        crawlTaskProgress.remove(taskId);
-    }
-
-    /**
-     * 获取爬虫源采集的章节数量
-     */
-    public Long getCrawlSourceChapterCount(Integer sourceId) {
-        return Optional.ofNullable(
-            stringRedisTemplate.opsForValue().get(CRAWL_SOURCE_CHAPTER_COUNT_CACHE_KEY + sourceId)).map(v -> {
-            try {
-                return Long.parseLong(v);
-            } catch (NumberFormatException e) {
-                return 0L;
-            }
-        }).orElse(0L);
-    }
-
-    public void parseBook(RuleBean ruleBean, String bookId, CrawlBookHandler handler)
-        throws InterruptedException {
+    @SneakyThrows
+    public static void parseBook(RuleBean ruleBean, String bookId, CrawlBookHandler handler) {
         Book book = new Book();
         String bookDetailUrl = ruleBean.getBookDetailUrl().replace("{bookId}", bookId);
-        String bookDetailHtml = crawlHttpClient.get(bookDetailUrl, ruleBean.getCharset());
+        String bookDetailHtml = getByHttpClientWithChrome(bookDetailUrl);
         if (bookDetailHtml != null) {
             Pattern bookNamePatten = PatternFactory.getPattern(ruleBean.getBookNamePatten());
             Matcher bookNameMatch = bookNamePatten.matcher(bookDetailHtml);
@@ -130,31 +89,14 @@ public class CrawlParser {
                         }
                     }
 
-                    String desc = bookDetailHtml.substring(
-                        bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
+                    String desc = bookDetailHtml.substring(bookDetailHtml.indexOf(ruleBean.getDescStart()) + ruleBean.getDescStart().length());
                     desc = desc.substring(0, desc.indexOf(ruleBean.getDescEnd()));
                     //过滤掉简介中的特殊标签
                     desc = desc.replaceAll("<a[^<]+</a>", "")
-                        .replaceAll("<font[^<]+</font>", "")
-                        .replaceAll("<p>\\s*</p>", "")
-                        .replaceAll("<p>", "")
-                        .replaceAll("</p>", "<br/>");
-                    // 小说简介过滤
-                    String filterDesc = ruleBean.getFilterDesc();
-                    if (StringUtils.isNotBlank(filterDesc)) {
-                        String[] filterRules = filterDesc.replace("\r\n", "\n").split("\n");
-                        for (String filterRule : filterRules) {
-                            if (StringUtils.isNotBlank(filterRule)) {
-                                desc = desc.replaceAll(filterRule, "");
-                            }
-                        }
-                    }
-                    // 去除小说简介前后空格
-                    desc = desc.trim();
-                    // 去除小说简介末尾冗余的小说名
-                    if (desc.endsWith(bookName)) {
-                        desc = desc.substring(0, desc.length() - bookName.length());
-                    }
+                            .replaceAll("<font[^<]+</font>", "")
+                            .replaceAll("<p>\\s*</p>", "")
+                            .replaceAll("<p>", "")
+                            .replaceAll("</p>", "<br/>");
                     //设置书籍简介
                     book.setBookDesc(desc);
                     if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@@ -170,20 +112,14 @@ public class CrawlParser {
                         }
                     }
 
-                    if (StringUtils.isNotBlank(ruleBean.getUpadateTimePatten()) && StringUtils.isNotBlank(
-                        ruleBean.getUpadateTimeFormatPatten())) {
+                    if (StringUtils.isNotBlank(ruleBean.getUpadateTimePatten()) && StringUtils.isNotBlank(ruleBean.getUpadateTimeFormatPatten())) {
                         Pattern updateTimePatten = PatternFactory.getPattern(ruleBean.getUpadateTimePatten());
                         Matcher updateTimeMatch = updateTimePatten.matcher(bookDetailHtml);
                         boolean isFindUpdateTime = updateTimeMatch.find();
                         if (isFindUpdateTime) {
                             String updateTime = updateTimeMatch.group(1);
                             //设置更新时间
-                            try {
-                                book.setLastIndexUpdateTime(
-                                    new SimpleDateFormat(ruleBean.getUpadateTimeFormatPatten()).parse(updateTime));
-                            } catch (ParseException e) {
-                                log.error("解析最新章节更新时间出错", e);
-                            }
+                            book.setLastIndexUpdateTime(new SimpleDateFormat(ruleBean.getUpadateTimeFormatPatten()).parse(updateTime));
 
                         }
                     }
@@ -195,7 +131,7 @@ public class CrawlParser {
                 } else if (book.getVisitCount() != null && book.getScore() == null) {
                     //随机根据访问次数生成评分
                     book.setScore(RandomBookInfoUtil.getScoreByVisitCount(book.getVisitCount()));
-                } else if (book.getVisitCount() == null) {
+                } else if (book.getVisitCount() == null && book.getScore() == null) {
                     //都没有，设置成固定值
                     book.setVisitCount(Constants.VISIT_COUNT_DEFAULT);
                     book.setScore(6.5f);
@@ -205,14 +141,7 @@ public class CrawlParser {
         handler.handle(book);
     }
 
-    public boolean parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Integer sourceId,
-        Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler, CrawlSingleTask task)
-        throws InterruptedException {
-
-        if (task != null) {
-            // 开始采集
-            crawlTaskProgress.put(task.getId(), 0);
-        }
+    public static boolean parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean, Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler) {
 
         Date currentDate = new Date();
 
@@ -220,12 +149,11 @@ public class CrawlParser {
         List<BookContent> contentList = new ArrayList<>();
         //读取目录
         String indexListUrl = ruleBean.getBookIndexUrl().replace("{bookId}", sourceBookId);
-        String indexListHtml = crawlHttpClient.get(indexListUrl, ruleBean.getCharset());
+        String indexListHtml = getByHttpClientWithChrome(indexListUrl);
 
         if (indexListHtml != null) {
             if (StringUtils.isNotBlank(ruleBean.getBookIndexStart())) {
-                indexListHtml = indexListHtml.substring(
-                    indexListHtml.indexOf(ruleBean.getBookIndexStart()) + ruleBean.getBookIndexStart().length());
+                indexListHtml = indexListHtml.substring(indexListHtml.indexOf(ruleBean.getBookIndexStart()) + ruleBean.getBookIndexStart().length());
             }
 
             Pattern indexIdPatten = PatternFactory.getPattern(ruleBean.getIndexIdPatten());
@@ -246,16 +174,14 @@ public class CrawlParser {
                 BookIndex hasIndex = existBookIndexMap.get(indexNum);
                 String indexName = indexNameMatch.group(1);
 
-                if (hasIndex == null || !StringUtils.deleteWhitespace(hasIndex.getIndexName())
-                    .equals(StringUtils.deleteWhitespace(indexName))) {
+                if (hasIndex == null || !StringUtils.deleteWhitespace(hasIndex.getIndexName()).equals(StringUtils.deleteWhitespace(indexName))) {
 
                     String sourceIndexId = indexIdMatch.group(1);
                     String bookContentUrl = ruleBean.getBookContentUrl();
                     int calStart = bookContentUrl.indexOf("{cal_");
                     if (calStart != -1) {
                         //内容页URL需要进行计算才能得到
-                        String calStr = bookContentUrl.substring(calStart,
-                            calStart + bookContentUrl.substring(calStart).indexOf("}"));
+                        String calStr = bookContentUrl.substring(calStart, calStart + bookContentUrl.substring(calStart).indexOf("}"));
                         String[] calArr = calStr.split("_");
                         int calType = Integer.parseInt(calArr[1]);
                         if (calType == 1) {
@@ -270,7 +196,7 @@ public class CrawlParser {
                                 calResult = sourceIndexId.substring(0, sourceBookId.length() - y);
                             }
 
-                            if (calResult.isEmpty()) {
+                            if (calResult.length() == 0) {
                                 calResult = "0";
 
                             }
@@ -280,27 +206,13 @@ public class CrawlParser {
 
                     }
 
-                    String contentUrl = bookContentUrl.replace("{bookId}", sourceBookId)
-                        .replace("{indexId}", sourceIndexId);
+                    String contentUrl = bookContentUrl.replace("{bookId}", sourceBookId).replace("{indexId}", sourceIndexId);
 
                     //查询章节内容
-                    String contentHtml = crawlHttpClient.get(contentUrl, ruleBean.getCharset());
+                    String contentHtml = getByHttpClientWithChrome(contentUrl);
                     if (contentHtml != null && !contentHtml.contains("正在手打中")) {
-                        String content = contentHtml.substring(
-                            contentHtml.indexOf(ruleBean.getContentStart()) + ruleBean.getContentStart().length());
+                        String content = contentHtml.substring(contentHtml.indexOf(ruleBean.getContentStart()) + ruleBean.getContentStart().length());
                         content = content.substring(0, content.indexOf(ruleBean.getContentEnd()));
-                        // 小说内容过滤
-                        String filterContent = ruleBean.getFilterContent();
-                        if (StringUtils.isNotBlank(filterContent)) {
-                            String[] filterRules = filterContent.replace("\r\n", "\n").split("\n");
-                            for (String filterRule : filterRules) {
-                                if (StringUtils.isNotBlank(filterRule)) {
-                                    content = content.replaceAll(filterRule, "");
-                                }
-                            }
-                        }
-                        // 去除小说内容末尾的所有换行
-                        content = removeTrailingBrTags(content);
                         //插入章节目录和章节内容
                         BookIndex bookIndex = new BookIndex();
                         bookIndex.setIndexName(indexName);
@@ -323,7 +235,7 @@ public class CrawlParser {
                         } else {
                             //章节插入
                             //设置目录和章节内容
-                            Long indexId = ID_WORKER.nextId();
+                            Long indexId = idWorker.nextId();
                             bookIndex.setId(indexId);
                             bookIndex.setBookId(book.getId());
 
@@ -336,13 +248,6 @@ public class CrawlParser {
                         }
                         bookIndex.setUpdateTime(currentDate);
 
-                        if (task != null) {
-                            // 更新单本任务采集进度
-                            crawlTaskProgress.put(task.getId(), indexList.size());
-                        }
-
-                        // 更新爬虫源采集章节数量
-                        stringRedisTemplate.opsForValue().increment(CRAWL_SOURCE_CHAPTER_COUNT_CACHE_KEY + sourceId);
 
                     }
 
@@ -352,10 +257,11 @@ public class CrawlParser {
                 isFindIndex = indexIdMatch.find() & indexNameMatch.find();
             }
 
-            if (!indexList.isEmpty()) {
+
+            if (indexList.size() > 0) {
                 //如果有爬到最新章节，则设置小说主表的最新章节信息
                 //获取爬取到的最新章节
-                BookIndex lastIndex = indexList.getLast();
+                BookIndex lastIndex = indexList.get(indexList.size() - 1);
                 book.setLastIndexId(lastIndex.getId());
                 book.setLastIndexName(lastIndex.getIndexName());
                 book.setLastIndexUpdateTime(currentDate);
@@ -364,7 +270,7 @@ public class CrawlParser {
             book.setWordCount(totalWordCount);
             book.setUpdateTime(currentDate);
 
-            if (indexList.size() == contentList.size() && !indexList.isEmpty()) {
+            if (indexList.size() == contentList.size() && indexList.size() > 0) {
 
                 handler.handle(new ChapterBean() {{
                     setBookIndexList(indexList);
@@ -385,11 +291,55 @@ public class CrawlParser {
 
     }
 
-    /**
-     * 删除字符串末尾的所有 <br> 类似标签（允许各种空格）
-     */
-    public static String removeTrailingBrTags(String str) {
-        return str.replaceAll("(?i)(?:\\s*<\\s*br\\s*/?\\s*>)++(?:\\s|\\u3000)*$", "");
+
+    private static String getByHttpClient(String url) {
+        try {
+            ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
+            if (forEntity.getStatusCode() == HttpStatus.OK) {
+                String body = forEntity.getBody();
+                assert body != null;
+                if (body.length() < Constants.INVALID_HTML_LENGTH) {
+                    return processErrorHttpResult(url);
+                }
+                //成功获得html内容
+                return body;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return processErrorHttpResult(url);
+
     }
 
+    private static String getByHttpClientWithChrome(String url) {
+        try {
+
+            String body = HttpUtil.getByHttpClientWithChrome(url);
+            if (body != null && body.length() < Constants.INVALID_HTML_LENGTH) {
+                return processErrorHttpResult(url);
+            }
+            //成功获得html内容
+            return body;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return processErrorHttpResult(url);
+
+    }
+
+    @SneakyThrows
+    private static String processErrorHttpResult(String url) {
+        Integer count = retryCount.get();
+        if (count == null) {
+            count = 0;
+        }
+        if (count < Constants.HTTP_FAIL_RETRY_COUNT) {
+            Thread.sleep(new Random().nextInt(10 * 1000));
+            retryCount.set(++count);
+            return getByHttpClient(url);
+        }
+        return null;
+    }
+
+
 }

novel-crawl/src/main/java/com/java2nb/novel/core/crawl/RuleBean.java

@@ -1,37 +1,29 @@
 package com.java2nb.novel.core.crawl;
 
-import com.java2nb.novel.utils.Constants;
 import lombok.Data;
 
 import java.util.Map;
 
 /**
  * 爬虫解析规则bean
- *
  * @author Administrator
  */
 @Data
 public class RuleBean {
 
-    /**
-     * 网页字符编码
-     */
-    private String charset = Constants.CRAWL_DEFAULT_CHARSET;
-
-
     /**
      * 小说更新列表url
-     */
+     * */
     private String updateBookListUrl;
 
     /**
      * 分类列表页URL规则
-     */
+     * */
     private String bookListUrl;
 
-    private Map<String, String> catIdRule;
+    private Map<String,String> catIdRule;
 
-    private Map<String, Byte> bookStatusRule;
+    private Map<String,Byte> bookStatusRule;
 
     private String bookIdPatten;
     private String pagePatten;
@@ -45,7 +37,6 @@ public class RuleBean {
     private String visitCountPatten;
     private String descStart;
     private String descEnd;
-    private String filterDesc;
     private String upadateTimePatten;
     private String upadateTimeFormatPatten;
     private String bookIndexUrl;
@@ -60,7 +51,5 @@ public class RuleBean {
 
     private String bookIndexStart;
 
-    private String filterContent;
-
 
 }