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

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

README.md

@@ -1,5 +1,4 @@
 <p align="center">
-    <a href="https://www.swiftproxy.net/?code=T2WV1VT50"><img src="https://xxyopen.com/images/ad1.png" alt="AD" ></a>
     <a href="https://cloud.tencent.com/act/cps/redirect?redirect=2446&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console"><img src="https://youdoc.github.io/img/tencent.jpg" alt="AD" ></a>
 </p>
 <p align="center">
@@ -10,20 +9,20 @@
 </p>
 
 <p align="center">
-      👉 <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>
+      👉 <a href='https://novel.xxyopen.com'>官网</a>  |  👉 <a href='http://117.72.165.13:8888'>演示站点</a>  |  👉 <a href='https://docs.xxyopen.com/course/novelplus/1.html'>安装教程</a>
 </p> 
 
 ## 项目介绍
 
 novel-plus 是一个多端（PC、WAP）阅读，功能完善的原创文学 CMS
 系统。由前台门户系统、作家后台管理系统、平台后台管理系统和爬虫管理系统等多个子系统构成，包括小说推荐、作品检索、小说排行、小说阅读、小说评论、会员中心、作家专区等功能，支持自定义多模版、可拓展的多种小说内容存储方式（内置数据库分表存储和
-TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、会员充值、订阅模式、新闻发布和实时统计报表。
+TXT 文本存储）、阅读主题切换、多爬虫源自动采集和更新数据、AI写作、会员充值、订阅模式、新闻发布和实时统计报表。
 
 ## 项目地址
 
 - 学习版：[GitHub](https://github.com/201206030/novel) ｜ [码云](https://gitee.com/novel_dev_team/novel)
   ｜ [保姆级教程](https://docs.xxyopen.com) 
-- **应用版**：[GitHub](https://github.com/201206030/novel-plus) ｜ [码云](https://gitee.com/novel_dev_team/novel-plus)
+- **应用版**：[GitHub](https://github.com/201206030/novel-plus) ｜ [码云](https://gitee.com/novel_dev_team/novel-plus) ｜ [演示站点](http://117.72.165.13:8888)
 - 微服务版：[GitHub](https://github.com/201206030/novel-cloud) ｜ [码云](https://gitee.com/novel_dev_team/novel-cloud)
 
 ## 项目结构
@@ -40,17 +39,17 @@ novel-plus -- 父工程
 ## 技术选型
 
 | 技术                  | 说明                  
-|---------------------| ---------------------------
+|---------------------|---------------------
 | Spring Boot         | Spring 应用快速开发脚手架    
-| Spring AI           |    Spring 官方 AI 框架     
+| Spring AI           | Spring 官方 AI 框架     
 | MyBatis             | 持久层 ORM 框架          
 | MyBatis Dynamic SQL | Mybatis 动态 sql      
 | PageHelper          | MyBatis 分页插件        
-| MyBatis Generator    | 持久层代码生成插件
+| MyBatis Generator   | 持久层代码生成插件           
 | Sharding-JDBC       | 代码层分库分表中间件          
 | JJWT                | JWT 登录支持            
-| Spring Security      | 安全框架
-| Apache Shiro               | 安全框架
+| Spring Security     | 安全框架                
+| Apache Shiro        | 安全框架                
 | Redis               | 缓存方案                
 | Aliyun OSS          | 阿里云对象存储服务（图片存储备选方案） 
 | Lombok              | 简化对象封装工具            
@@ -71,6 +70,39 @@ 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-Distill-Llama-8B`（DeepSeek-R1 的蒸馏版本，免费使用）和生图模型`Kwai-Kolors/Kolors`（快手 Kolors 团队开发的文本到图像生成模型，免费使用）。只需注册一个硅基流动账号，创建一个 API 密钥，并将其添加到 novel-plus 项目 novel-front 模块的 yaml 配置文件中，即可体验 novel-plus 项目的 AI 写作功能。
+
+```yaml
+spring:
+  ai:
+    openai:
+      image:
+        enabled: true
+        base-url: https://api.siliconflow.cn
+        api-key: sk-rrrupturhdofbiqzjutduuiceecpvfqlnvmgcyiaipbdikoi
+        options:
+          model: Kwai-Kolors/Kolors
+          response_format: URL
+      api-key: sk-rrrupturhdofbiqzjutduuiceecpvfqlnvmgcyiaipbdikoi
+      base-url: https://api.siliconflow.cn
+      chat:
+        options:
+          model: deepseek-ai/DeepSeek-R1-Distill-Llama-8B
+```
+
+⚠️ novel-plus 项目默认使用的都是免费 AI 模型，生成效果有限。如果对生成内容有更高的要求，建议选用付费的 AI 模型。
+
 ## 增值服务
 
 👉 [了解详情](https://novel.xxyopen.com/service.htm)
@@ -95,3 +127,5 @@ https://www.bilibili.com/video/BV18e41197xs
 ## 免责声明
 
 本项目提供的爬虫工具仅用于采集项目初期的测试数据，请勿用于商业盈利。 用户使用本系统从事任何违法违规的事情，一切后果由用户自行承担，作者不承担任何责任。
+
+

config/shardingsphere-jdbc.yml

@@ -11,13 +11,13 @@ 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
+    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?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://localhost:3306/information_schema?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
     password: test123456
 # 规则配置

doc/sql/20250630.sql

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

doc/sql/novel_plus.sql

@@ -3154,3 +3154,8 @@ 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 ;
+
+

novel-admin/pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel-admin</artifactId>
-    <version>5.0.1</version>
+    <version>5.1.5</version>
     <packaging>jar</packaging>
 
     <name>novel-admin</name>

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.0.1</version>
+        <version>5.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -0,0 +1,53 @@
+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/cache/CacheKey.java

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

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

@@ -18,6 +18,11 @@ 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.util.Date;
 import java.util.Objects;
 
@@ -125,5 +130,23 @@ 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

@@ -5,8 +5,8 @@ import org.springframework.http.*;
 import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.Charset;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author Administrator
@@ -16,7 +16,7 @@ public class HttpUtil {
 
     private static final String DEFAULT_CHARSET = "utf-8";
 
-    private static final Map<String, RestTemplate> REST_TEMPLATE_MAP = new HashMap<>();
+    private static final Map<String, RestTemplate> REST_TEMPLATE_MAP = new ConcurrentHashMap<>();
 
     public static String getByHttpClientWithChrome(String url, String charset) {
         log.debug("Get url：{}", url);

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

@@ -1,11 +1,21 @@
 package com.java2nb.novel.core.utils;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
 
+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
      */
@@ -31,4 +41,27 @@ 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/entity/BookComment.java

@@ -14,6 +14,9 @@ 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;
 
@@ -56,6 +59,16 @@ 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/mapper/BookCommentDynamicSqlSupport.java

@@ -19,6 +19,9 @@ 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;
 
@@ -39,6 +42,8 @@ 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, replyCount, auditStatus, createTime, createUserId);
+    BasicColumn[] selectList = BasicColumn.columnList(id, bookId, commentContent, location, replyCount, auditStatus, createTime, createUserId);
 
     @Generated("org.mybatis.generator.api.MyBatisGenerator")
     @SelectProvider(type=SqlProviderAdapter.class, method="select")
@@ -58,6 +58,7 @@ 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),
@@ -92,6 +93,7 @@ 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")
@@ -105,6 +107,7 @@ 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")
@@ -118,6 +121,7 @@ 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)
@@ -157,6 +161,7 @@ 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)
@@ -168,6 +173,7 @@ 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)
@@ -179,6 +185,7 @@ 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)
@@ -192,6 +199,7 @@ 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/resources/application-common.yml

@@ -6,11 +6,6 @@ spring:
     mode: LEGACYHTML5 #去除thymeleaf的html严格校验thymeleaf.mode=LEGACYHTML5
     cache: false # 是否开启模板缓存，默认true,建议在开发时关闭缓存,不然没法看到实时
 
-  # 将所有数字转为 String 类型返回，避免前端数据精度丢失的问题
-  jackson:
-    generator:
-      write-numbers-as-strings: true
-
   #上传文件的最大值（100M）
   servlet:
     multipart:

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.0.1</version>
+        <version>5.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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);
+    void handle(Book book) throws InterruptedException;
 
 }

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

@@ -10,9 +10,11 @@ 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.stereotype.Component;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -26,6 +28,7 @@ import java.util.regex.Pattern;
  *
  * @author Administrator
  */
+@Slf4j
 @Component
 @RequiredArgsConstructor
 public class CrawlParser {
@@ -34,8 +37,8 @@ public class CrawlParser {
 
     private final CrawlHttpClient crawlHttpClient;
 
-    @SneakyThrows
-    public void parseBook(RuleBean ruleBean, String bookId, CrawlBookHandler handler) {
+    public void parseBook(RuleBean ruleBean, String bookId, CrawlBookHandler handler)
+        throws InterruptedException {
         Book book = new Book();
         String bookDetailUrl = ruleBean.getBookDetailUrl().replace("{bookId}", bookId);
         String bookDetailHtml = crawlHttpClient.get(bookDetailUrl, ruleBean.getCharset());
@@ -97,6 +100,22 @@ public class CrawlParser {
                         .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());
+                    }
                     //设置书籍简介
                     book.setBookDesc(desc);
                     if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
@@ -120,8 +139,12 @@ public class CrawlParser {
                         if (isFindUpdateTime) {
                             String updateTime = updateTimeMatch.group(1);
                             //设置更新时间
-                            book.setLastIndexUpdateTime(
-                                new SimpleDateFormat(ruleBean.getUpadateTimeFormatPatten()).parse(updateTime));
+                            try {
+                                book.setLastIndexUpdateTime(
+                                    new SimpleDateFormat(ruleBean.getUpadateTimeFormatPatten()).parse(updateTime));
+                            } catch (ParseException e) {
+                                log.error("解析最新章节更新时间出错", e);
+                            }
 
                         }
                     }
@@ -144,7 +167,7 @@ public class CrawlParser {
     }
 
     public boolean parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean,
-        Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler) {
+        Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler) throws InterruptedException {
 
         Date currentDate = new Date();
 
@@ -231,6 +254,8 @@ public class CrawlParser {
                                 }
                             }
                         }
+                        // 去除小说内容末尾的所有换行
+                        content = removeTrailingBrTags(content);
                         //插入章节目录和章节内容
                         BookIndex bookIndex = new BookIndex();
                         bookIndex.setIndexName(indexName);
@@ -307,4 +332,12 @@ public class CrawlParser {
         return false;
 
     }
+
+    /**
+     * 删除字符串末尾的所有 <br> 类似标签（允许各种空格）
+     */
+    public static String removeTrailingBrTags(String str) {
+        return str.replaceAll("(?i)(?:\\s*<\\s*br\\s*/?\\s*>)++(?:\\s|\\u3000)*$", "");
+    }
+
 }

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

@@ -45,6 +45,7 @@ public class RuleBean {
     private String visitCountPatten;
     private String descStart;
     private String descEnd;
+    private String filterDesc;
     private String upadateTimePatten;
     private String upadateTimeFormatPatten;
     private String bookIndexUrl;

novel-crawl/src/main/java/com/java2nb/novel/core/listener/StarterListener.java

@@ -74,10 +74,8 @@ public class StarterListener implements ServletContextInitializer {
                                         needUpdateBook.getId());
                                     //解析章节目录
                                     crawlParser.parseBookIndexAndContent(needUpdateBook.getCrawlBookId(), book,
-                                        ruleBean, existBookIndexMap, chapter -> {
-                                            bookService.updateBookAndIndexAndContent(book, chapter.getBookIndexList(),
-                                                chapter.getBookContentList(), existBookIndexMap);
-                                        });
+                                        ruleBean, existBookIndexMap, chapter -> bookService.updateBookAndIndexAndContent(book, chapter.getBookIndexList(),
+                                            chapter.getBookContentList(), existBookIndexMap));
                                 });
                             } catch (Exception e) {
                                 log.error(e.getMessage(), e);

novel-crawl/src/main/java/com/java2nb/novel/core/schedule/CrawlThreadMonitor.java

@@ -1,61 +0,0 @@
-package com.java2nb.novel.core.schedule;
-
-
-import com.java2nb.novel.core.cache.CacheKey;
-import com.java2nb.novel.core.cache.CacheService;
-import com.java2nb.novel.entity.CrawlSource;
-import com.java2nb.novel.service.CrawlService;
-import io.github.xxyopen.util.ThreadUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * 爬虫线程监控器,监控执行完成的爬虫源，并修改状态
- *
- * @author Administrator
- */
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class CrawlThreadMonitor {
-
-    private final CacheService cacheService;
-
-    private final CrawlService crawlService;
-
-    @Scheduled(fixedRate = 1000 * 60 * 5)
-    public void monitor() {
-
-        //查询需要监控的正在运行的爬虫源
-        List<CrawlSource> sources = crawlService.queryCrawlSourceByStatus((byte) 1);
-
-        for (CrawlSource source : sources) {
-            Set<Long> runningCrawlThreadIds = (Set<Long>) cacheService.getObject(CacheKey.RUNNING_CRAWL_THREAD_KEY_PREFIX + source.getId());
-            boolean sourceStop = true;
-            if (runningCrawlThreadIds != null) {
-                for (Long threadId : runningCrawlThreadIds) {
-                    Thread thread = ThreadUtil.findThread(threadId);
-
-                    if (thread != null && thread.isAlive()) {
-                        //有活跃线程，说明该爬虫源正在运行，数据库中状态正确，不需要修改
-                        sourceStop = false;
-
-                    }
-
-                }
-            }
-
-            if (sourceStop) {
-                crawlService.updateCrawlSourceStatus(source.getId(), (byte) 0);
-            }
-
-
-        }
-
-    }
-}

novel-crawl/src/main/java/com/java2nb/novel/service/CrawlService.java

@@ -53,7 +53,7 @@ public interface CrawlService {
      * @param ruleBean 采集规则\
      * @return true:成功，false:失败
      * */
-    boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId);
+    boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId) throws InterruptedException;
 
     /**
      * 根据爬虫状态查询爬虫源集合

novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java

@@ -34,6 +34,7 @@ import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.springframework.stereotype.Service;
 
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Matcher;
@@ -65,6 +66,10 @@ public class CrawlServiceImpl implements CrawlService {
 
     private final CrawlHttpClient crawlHttpClient;
 
+    private final Map<Integer, Byte> crawlSourceStatusMap = new HashMap<>();
+
+    private final Map<Integer, Set<Long>> runningCrawlThread = new HashMap<>();
+
 
     @Override
     public void addCrawlSource(CrawlSource source) {
@@ -103,6 +108,8 @@ public class CrawlServiceImpl implements CrawlService {
             .build()
             .render(RenderingStrategies.MYBATIS3);
         List<CrawlSource> crawlSources = crawlSourceMapper.selectMany(render);
+        crawlSources.forEach(crawlSource -> crawlSource.setSourceStatus(
+            Optional.ofNullable(crawlSourceStatusMap.get(crawlSource.getId())).orElse((byte) 0)));
         PageBean<CrawlSource> pageBean = PageBuilder.build(crawlSources);
         pageBean.setList(BeanUtil.copyList(crawlSources, CrawlSourceVO.class));
         return pageBean;
@@ -112,14 +119,13 @@ public class CrawlServiceImpl implements CrawlService {
     @Override
     public void openOrCloseCrawl(Integer sourceId, Byte sourceStatus) {
 
-        //判断是开启还是关闭，如果是关闭，则修改数据库状态后获取该爬虫正在运行的线程集合并全部停止
-        //如果是开启，先查询数据库中状态，判断该爬虫源是否还在运行，如果在运行，则忽略，
-        // 如果没有则修改数据库状态，并启动线程爬取小说数据加入到runningCrawlThread中
+        // 判断是开启还是关闭，如果是关闭，则获取该爬虫源正在运行的线程集合并全部中断
+        // 如果是开启，先判断该爬虫源是否还在运行，如果在运行，则忽略，如果没有运行则启动线程爬取小说数据并加入到runningCrawlThread中
+        // 最后，保存爬虫源状态
         if (sourceStatus == (byte) 0) {
-            //关闭,直接修改数据库状态，并直接修改数据库状态后获取该爬虫正在运行的线程集合全部停止
-            SpringUtil.getBean(CrawlService.class).updateCrawlSourceStatus(sourceId, sourceStatus);
-            Set<Long> runningCrawlThreadId = (Set<Long>) cacheService.getObject(
-                CacheKey.RUNNING_CRAWL_THREAD_KEY_PREFIX + sourceId);
+            // 关闭
+            // 将该爬虫源正在运行的线程集合全部停止
+            Set<Long> runningCrawlThreadId = runningCrawlThread.get(sourceId);
             if (runningCrawlThreadId != null) {
                 for (Long ThreadId : runningCrawlThreadId) {
                     Thread thread = ThreadUtil.findThread(ThreadId);
@@ -131,16 +137,13 @@ public class CrawlServiceImpl implements CrawlService {
 
 
         } else {
-            //开启
-            //查询爬虫源状态和规则
-            CrawlSource source = queryCrawlSource(sourceId);
-            Byte realSourceStatus = source.getSourceStatus();
-
+            // 开启
+            Byte realSourceStatus = Optional.ofNullable(crawlSourceStatusMap.get(sourceId)).orElse((byte) 0);
             if (realSourceStatus == (byte) 0) {
-                //该爬虫源已经停止运行了,修改数据库状态，并启动线程爬取小说数据加入到runningCrawlThread中
-                SpringUtil.getBean(CrawlService.class).updateCrawlSourceStatus(sourceId, sourceStatus);
+                // 查询爬虫源规则
+                CrawlSource source = queryCrawlSource(sourceId);
+                //该爬虫源已经停止运行了,启动线程爬取小说数据并将线程加入到runningCrawlThread中
                 RuleBean ruleBean = new ObjectMapper().readValue(source.getCrawlRule(), RuleBean.class);
-
                 Set<Long> threadIds = new HashSet<>();
                 //按分类开始爬虫解析任务
                 for (int i = 1; i < 8; i++) {
@@ -149,16 +152,15 @@ public class CrawlServiceImpl implements CrawlService {
                     thread.start();
                     //thread加入到监控缓存中
                     threadIds.add(thread.getId());
-
                 }
-                cacheService.setObject(CacheKey.RUNNING_CRAWL_THREAD_KEY_PREFIX + sourceId, threadIds);
-
-
+                runningCrawlThread.put(sourceId, threadIds);
             }
 
-
         }
 
+        // 保存爬虫源状态
+        crawlSourceStatusMap.put(sourceId, sourceStatus);
+
     }
 
     @Override
@@ -248,6 +250,11 @@ public class CrawlServiceImpl implements CrawlService {
     @Override
     public void parseBookList(int catId, RuleBean ruleBean, Integer sourceId) {
 
+        String catIdRule = ruleBean.getCatIdRule().get("catId" + catId);
+        if (StringUtils.isBlank(catIdRule)) {
+            return;
+        }
+
         //当前页码1
         int page = 1;
         int totalPage = page;
@@ -255,73 +262,91 @@ public class CrawlServiceImpl implements CrawlService {
         while (page <= totalPage) {
 
             try {
-                String catIdRule = ruleBean.getCatIdRule().get("catId" + catId);
-                if (StringUtils.isNotBlank(catIdRule)) {
-                    String catBookListUrl = "";
-                    if (StringUtils.isNotBlank(ruleBean.getBookListUrl())) {
-                        // 兼容老规则
-                        // 拼接分类URL
-                        catBookListUrl = ruleBean.getBookListUrl()
-                            .replace("{catId}", catIdRule)
-                            .replace("{page}", page + "");
-                    } else {
-                        // 新规则
-                        // 拼接分类URL
-                        catBookListUrl = catIdRule.replace("{page}", page + "");
-                    }
-                    log.info("catBookListUrl：{}", catBookListUrl);
+                String catBookListUrl;
+                if (StringUtils.isNotBlank(ruleBean.getBookListUrl())) {
+                    // 兼容老规则
+                    // 拼接分类URL
+                    catBookListUrl = ruleBean.getBookListUrl()
+                        .replace("{catId}", catIdRule)
+                        .replace("{page}", page + "");
+                } else {
+                    // 新规则
+                    // 拼接分类URL
+                    catBookListUrl = catIdRule.replace("{page}", page + "");
+                }
+                log.info("catBookListUrl：{}", catBookListUrl);
 
-                    String bookListHtml = crawlHttpClient.get(catBookListUrl, ruleBean.getCharset());
-                    if (bookListHtml != null) {
-                        Pattern bookIdPatten = Pattern.compile(ruleBean.getBookIdPatten());
-                        Matcher bookIdMatcher = bookIdPatten.matcher(bookListHtml);
-                        boolean isFindBookId = bookIdMatcher.find();
-                        while (isFindBookId) {
-                            try {
-                                //1.阻塞过程（使用了 sleep,同步锁的 wait,socket 中的 receiver,accept 等方法时）
-                                //捕获中断异常InterruptedException来退出线程。
-                                //2.非阻塞过程中通过判断中断标志来退出线程。
-                                if (Thread.currentThread().isInterrupted()) {
-                                    return;
-                                }
-
-                                String bookId = bookIdMatcher.group(1);
-                                parseBookAndSave(catId, ruleBean, sourceId, bookId);
-                            } catch (Exception e) {
-                                log.error(e.getMessage(), e);
+                String bookListHtml = crawlHttpClient.get(catBookListUrl, ruleBean.getCharset());
+                if (bookListHtml != null) {
+                    Pattern bookIdPatten = Pattern.compile(ruleBean.getBookIdPatten());
+                    Matcher bookIdMatcher = bookIdPatten.matcher(bookListHtml);
+                    boolean isFindBookId = bookIdMatcher.find();
+                    while (isFindBookId) {
+                        try {
+                            //1.阻塞过程（使用了 sleep,同步锁的 wait,socket 中的 receiver,accept 等方法时）
+                            //捕获中断异常InterruptedException来退出线程。
+                            //2.非阻塞过程中通过判断中断标志来退出线程。
+                            if (Thread.currentThread().isInterrupted()) {
+                                return;
                             }
 
-                            isFindBookId = bookIdMatcher.find();
+                            String bookId = bookIdMatcher.group(1);
+                            parseBookAndSave(catId, ruleBean, sourceId, bookId);
+                        } catch (InterruptedException e) {
+                            log.error(e.getMessage(), e);
+                            //1.阻塞过程（使用了 sleep,同步锁的 wait,socket 中的 receiver,accept 等方法时）
+                            //捕获中断异常InterruptedException来退出线程。
+                            //2.非阻塞过程中通过判断中断标志来退出线程。
+                            return;
+                        } catch (Exception e) {
+                            log.error(e.getMessage(), e);
                         }
 
-                        Pattern totalPagePatten = Pattern.compile(ruleBean.getTotalPagePatten());
-                        Matcher totalPageMatcher = totalPagePatten.matcher(bookListHtml);
-                        boolean isFindTotalPage = totalPageMatcher.find();
-                        if (isFindTotalPage) {
+                        isFindBookId = bookIdMatcher.find();
+                    }
 
-                            totalPage = Integer.parseInt(totalPageMatcher.group(1));
-
-                        }
+                    Pattern totalPagePatten = Pattern.compile(ruleBean.getTotalPagePatten());
+                    Matcher totalPageMatcher = totalPagePatten.matcher(bookListHtml);
+                    boolean isFindTotalPage = totalPageMatcher.find();
+                    if (isFindTotalPage) {
 
+                        totalPage = Integer.parseInt(totalPageMatcher.group(1));
 
                     }
                 }
+            } catch (InterruptedException e) {
+                log.error(e.getMessage(), e);
+                //1.阻塞过程（使用了 sleep,同步锁的 wait,socket 中的 receiver,accept 等方法时）
+                //捕获中断异常InterruptedException来退出线程。
+                //2.非阻塞过程中通过判断中断标志来退出线程。
+                return;
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
             }
-            if (page == totalPage) {
+            if (page >= totalPage) {
                 // 第一遍采集完成，翻到第一页，继续第二次采集，适用于分页数比较少的最近更新列表
-                page = 0;
+                page = 1;
+                try {
+                    // 第一遍采集完成，休眠1分钟
+                    Thread.sleep(Duration.ofMinutes(1));
+                } catch (InterruptedException e) {
+                    log.error(e.getMessage(), e);
+                    //1.阻塞过程（使用了 sleep,同步锁的 wait,socket 中的 receiver,accept 等方法时）
+                    //捕获中断异常InterruptedException来退出线程。
+                    //2.非阻塞过程中通过判断中断标志来退出线程。
+                    return;
+                }
+            } else {
+                page += 1;
             }
-
-            page += 1;
         }
 
 
     }
 
     @Override
-    public boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId) {
+    public boolean parseBookAndSave(int catId, RuleBean ruleBean, Integer sourceId, String bookId)
+        throws InterruptedException {
 
         final AtomicBoolean parseResult = new AtomicBoolean(false);
 
@@ -385,4 +410,5 @@ public class CrawlServiceImpl implements CrawlService {
             .render(RenderingStrategies.MYBATIS3);
         return crawlSourceMapper.selectMany(render);
     }
+
 }

novel-crawl/src/main/java/com/java2nb/novel/utils/CrawlHttpClient.java

@@ -25,13 +25,9 @@ public class CrawlHttpClient {
 
     private static final ThreadLocal<Integer> RETRY_COUNT = new ThreadLocal<>();
 
-    public String get(String url, String charset) {
+    public String get(String url, String charset) throws InterruptedException {
         if (Objects.nonNull(intervalMin) && Objects.nonNull(intervalMax) && intervalMax > intervalMin) {
-            try {
-                Thread.sleep(random.nextInt(intervalMax - intervalMin + 1) + intervalMin);
-            } catch (InterruptedException e) {
-                log.error(e.getMessage(), e);
-            }
+            Thread.sleep(random.nextInt(intervalMax - intervalMin + 1) + intervalMin);
         }
         String body = HttpUtil.getByHttpClientWithChrome(url, charset);
         if (Objects.isNull(body) || body.length() < Constants.INVALID_HTML_LENGTH) {
@@ -41,7 +37,7 @@ public class CrawlHttpClient {
         return body;
     }
 
-    private String processErrorHttpResult(String url, String charset) {
+    private String processErrorHttpResult(String url, String charset) throws InterruptedException{
         Integer count = RETRY_COUNT.get();
         if (count == null) {
             count = 0;

novel-crawl/src/main/resources/templates/crawl/crawlSource_add.html

@@ -118,6 +118,9 @@
                                 示例：<b>&lt;/p&gt;</b>
                                 <li><input type="text" id="descEnd" class="s_input icon_key" placeholder="小说简介结束截取字符串：">
                                 </li>
+                                示例：<b>&lt;span\s+class="allshow"&gt;([^/]+)&lt;/span&gt;</b>
+                                <li><textarea id="filterDesc"
+                                              placeholder="过滤简介（多个内容换行）" rows="5" cols="52"></textarea></li>
                                 示例：<b>更新：(\d+-\d+-\d+\s\d+:\d+:\d+)&lt;/a&gt;</b>
                                 <li><input type="text" id="upadateTimePatten" class="s_input icon_key"
                                            placeholder="小说更新时间的正则表达式："></li>
@@ -338,6 +341,9 @@
 
         crawlRule.descEnd = descEnd;
 
+        var filterDesc = $("#filterDesc").val();
+        crawlRule.filterDesc = filterDesc;
+
         var upadateTimePatten = $("#upadateTimePatten").val();
 
         if (upadateTimePatten.length > 0) {

novel-crawl/src/main/resources/templates/crawl/crawlSource_update.html

@@ -119,6 +119,9 @@
                                 示例：<b>&lt;/p&gt;</b>
                                 <li><input type="text" id="descEnd" class="s_input icon_key" placeholder="小说简介结束截取字符串：">
                                 </li>
+                                示例：<b>&lt;span\s+class="allshow"&gt;([^/]+)&lt;/span&gt;</b>
+                                <li><textarea id="filterDesc"
+                                              placeholder="过滤简介（多个内容换行）" rows="5" cols="52"></textarea></li>
                                 示例：<b>更新：(\d+-\d+-\d+\s\d+:\d+:\d+)&lt;/a&gt;</b>
                                 <li><input type="text" id="upadateTimePatten" class="s_input icon_key"
                                            placeholder="小说更新时间的正则表达式："></li>
@@ -266,6 +269,7 @@
             $("#visitCountPatten").val(crawlRule.visitCountPatten);
             $("#descStart").val(crawlRule.descStart);
             $("#descEnd").val(crawlRule.descEnd);
+            $("#filterDesc").val(crawlRule.filterDesc);
             $("#upadateTimePatten").val(crawlRule.upadateTimePatten);
             $("#upadateTimeFormatPatten").val(crawlRule.upadateTimeFormatPatten);
             $("#bookIndexUrl").val(crawlRule.bookIndexUrl);
@@ -424,6 +428,9 @@
 
         crawlRule.descEnd = descEnd;
 
+        var filterDesc = $("#filterDesc").val();
+        crawlRule.filterDesc = filterDesc;
+
         var upadateTimePatten = $("#upadateTimePatten").val();
 
         if (upadateTimePatten.length > 0) {

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>5.0.1</version>
+        <version>5.1.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -61,6 +61,12 @@
             <groupId>org.springframework.ai</groupId>
             <artifactId>spring-ai-openai-spring-boot-starter</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>2.7.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -54,7 +54,14 @@ http:
 spring:
   ai:
     openai:
-      api-key: sk-nnhjmxuljagcuubbovjztbhkiawqaabzziazeurppinxtgva
+      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:

novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java

@@ -17,7 +17,14 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.ai.chat.messages.UserMessage;
+import org.springframework.ai.chat.model.ChatModel;
+import org.springframework.ai.chat.model.ChatResponse;
+import org.springframework.ai.chat.prompt.Prompt;
+import org.springframework.ai.openai.OpenAiChatModel;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
 
 import java.util.Date;
 
@@ -28,7 +35,7 @@ import java.util.Date;
 @RestController
 @Slf4j
 @RequiredArgsConstructor
-public class AuthorController extends BaseController{
+public class AuthorController extends BaseController {
 
     private final AuthorService authorService;
 
@@ -36,62 +43,64 @@ public class AuthorController extends BaseController{
 
     private final ChatClient chatClient;
 
+    private final OpenAiChatModel chatModel;
+
     /**
      * 校验笔名是否存在
-     * */
+     */
     @GetMapping("checkPenName")
-    public RestResult<Boolean> checkPenName(String penName){
+    public RestResult<Boolean> checkPenName(String penName) {
 
         return RestResult.ok(authorService.checkPenName(penName));
     }
 
     /**
      * 作家发布小说分页列表查询
-     * */
+     */
     @GetMapping("listBookByPage")
-    public RestResult<PageBean<Book>> listBookByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize , HttpServletRequest request){
+    public RestResult<PageBean<Book>> listBookByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
 
-        return RestResult.ok(bookService.listBookPageByUserId(getUserDetails(request).getId(),page,pageSize));
+        return RestResult.ok(bookService.listBookPageByUserId(getUserDetails(request).getId(), page, pageSize));
     }
 
     /**
      * 发布小说
-     * */
+     */
     @PostMapping("addBook")
-    public RestResult<Void> addBook(@RequestParam("bookDesc") String bookDesc, Book book, HttpServletRequest request){
+    public RestResult<Void> addBook(@RequestParam("bookDesc") String bookDesc, Book book, HttpServletRequest request) {
 
         Author author = checkAuthor(request);
 
         //bookDesc不能使用book对象来接收，否则会自动去掉前面的空格
         book.setBookDesc(bookDesc
-                .replaceAll("\\n","<br>")
-                .replaceAll("\\s","&nbsp;"));
+            .replaceAll("\\n", "<br>")
+            .replaceAll("\\s", "&nbsp;"));
         //发布小说
-        bookService.addBook(book,author.getId(),author.getPenName());
+        bookService.addBook(book, author.getId(), author.getPenName());
 
         return RestResult.ok();
     }
 
     /**
      * 更新小说状态,上架或下架
-     * */
+     */
     @PostMapping("updateBookStatus")
-    public RestResult<Void> updateBookStatus(Long bookId,Byte status,HttpServletRequest request){
+    public RestResult<Void> updateBookStatus(Long bookId, Byte status, HttpServletRequest request) {
         Author author = checkAuthor(request);
 
         //更新小说状态,上架或下架
-        bookService.updateBookStatus(bookId,status,author.getId());
+        bookService.updateBookStatus(bookId, status, author.getId());
 
         return RestResult.ok();
     }
 
 
-
     /**
      * 删除章节
      */
     @DeleteMapping("deleteIndex/{indexId}")
-    public RestResult<Void> deleteIndex(@PathVariable("indexId") Long indexId,  HttpServletRequest request) {
+    public RestResult<Void> deleteIndex(@PathVariable("indexId") Long indexId, HttpServletRequest request) {
 
         Author author = checkAuthor(request);
 
@@ -105,7 +114,7 @@ public class AuthorController extends BaseController{
      * 更新章节名
      */
     @PostMapping("updateIndexName")
-    public RestResult<Void> updateIndexName(Long indexId,  String indexName, HttpServletRequest request) {
+    public RestResult<Void> updateIndexName(Long indexId, String indexName, HttpServletRequest request) {
 
         Author author = checkAuthor(request);
 
@@ -116,19 +125,18 @@ public class AuthorController extends BaseController{
     }
 
 
-
-
     /**
      * 发布章节内容
      */
     @PostMapping("addBookContent")
-    public RestResult<Void> addBookContent(Long bookId, String indexName, String content,Byte isVip, HttpServletRequest request) {
+    public RestResult<Void> addBookContent(Long bookId, String indexName, String content, Byte isVip,
+        HttpServletRequest request) {
         Author author = checkAuthor(request);
 
         content = content.replaceAll("\\n", "<br>")
-                .replaceAll("\\s", "&nbsp;");
+            .replaceAll("\\s", "&nbsp;");
         //发布章节内容
-        bookService.addBookContent(bookId, indexName, content,isVip, author.getId());
+        bookService.addBookContent(bookId, indexName, content, isVip, author.getId());
 
         return RestResult.ok();
     }
@@ -137,14 +145,14 @@ public class AuthorController extends BaseController{
      * 查询章节内容
      */
     @GetMapping("queryIndexContent/{indexId}")
-    public RestResult<String> queryIndexContent(@PathVariable("indexId") Long indexId,  HttpServletRequest request) {
+    public RestResult<String> queryIndexContent(@PathVariable("indexId") Long indexId, HttpServletRequest request) {
 
         Author author = checkAuthor(request);
 
         String content = bookService.queryIndexContent(indexId, author.getId());
 
         content = content.replaceAll("<br>", "\n")
-                .replaceAll("&nbsp;", " ");
+            .replaceAll("&nbsp;", " ");
 
         return RestResult.ok(content);
     }
@@ -153,11 +161,12 @@ public class AuthorController extends BaseController{
      * 更新章节内容
      */
     @PostMapping("updateBookContent")
-    public RestResult<Void> updateBookContent(Long indexId, String indexName, String content, HttpServletRequest request) {
+    public RestResult<Void> updateBookContent(Long indexId, String indexName, String content,
+        HttpServletRequest request) {
         Author author = checkAuthor(request);
 
         content = content.replaceAll("\\n", "<br>")
-                .replaceAll("\\s", "&nbsp;");
+            .replaceAll("\\s", "&nbsp;");
         //更新章节内容
         bookService.updateBookContent(indexId, indexName, content, author.getId());
 
@@ -168,38 +177,44 @@ public class AuthorController extends BaseController{
      * 修改小说封面
      */
     @PostMapping("updateBookPic")
-    public RestResult<Void> updateBookPic(@RequestParam("bookId") Long bookId,@RequestParam("bookPic") String bookPic,HttpServletRequest request) {
+    public RestResult<Void> updateBookPic(@RequestParam("bookId") Long bookId, @RequestParam("bookPic") String bookPic,
+        HttpServletRequest request) {
         Author author = checkAuthor(request);
-        bookService.updateBookPic(bookId,bookPic, author.getId());
+        bookService.updateBookPic(bookId, bookPic, author.getId());
         return RestResult.ok();
     }
 
 
     /**
      * 作家日收入统计数据分页列表查询
-     * */
+     */
     @GetMapping("listIncomeDailyByPage")
-    public RestResult<PageBean<AuthorIncomeDetail>> listIncomeDailyByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
-                                                                          @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
-                                                                          @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
-                                                                          @RequestParam(value = "startTime",defaultValue = "2020-05-01") Date startTime,
-                                                                          @RequestParam(value = "endTime",defaultValue = "2030-01-01") Date endTime,
-                                                                          HttpServletRequest request){
+    public RestResult<PageBean<AuthorIncomeDetail>> listIncomeDailyByPage(
+        @RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "10") int pageSize,
+        @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
+        @RequestParam(value = "startTime", defaultValue = "2020-05-01") Date startTime,
+        @RequestParam(value = "endTime", defaultValue = "2030-01-01") Date endTime,
+        HttpServletRequest request) {
 
-        return RestResult.ok(authorService.listIncomeDailyByPage(page,pageSize,getUserDetails(request).getId(),bookId,startTime,endTime));
+        return RestResult.ok(
+            authorService.listIncomeDailyByPage(page, pageSize, getUserDetails(request).getId(), bookId, startTime,
+                endTime));
     }
 
 
     /**
      * 作家月收入统计数据分页列表查询
-     * */
+     */
     @GetMapping("listIncomeMonthByPage")
-    public RestResult<PageBean<AuthorIncome>> listIncomeMonthByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
-                                                                    @RequestParam(value = "limit", defaultValue = "10") int pageSize ,
-                                                                    @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
-                                                                    HttpServletRequest request){
+    public RestResult<PageBean<AuthorIncome>> listIncomeMonthByPage(
+        @RequestParam(value = "curr", defaultValue = "1") int page,
+        @RequestParam(value = "limit", defaultValue = "10") int pageSize,
+        @RequestParam(value = "bookId", defaultValue = "0") Long bookId,
+        HttpServletRequest request) {
 
-        return RestResult.ok(authorService.listIncomeMonthByPage(page,pageSize,getUserDetails(request).getId(),bookId));
+        return RestResult.ok(
+            authorService.listIncomeMonthByPage(page, pageSize, getUserDetails(request).getId(), bookId));
     }
 
     private Author checkAuthor(HttpServletRequest request) {
@@ -218,22 +233,29 @@ public class AuthorController extends BaseController{
             throw new BusinessException(ResponseStatus.AUTHOR_STATUS_FORBIDDEN);
         }
 
-
         return author;
 
 
     }
 
+    /**
+     * 查询AI生成图片
+     */
+    @GetMapping("queryAiGenPic")
+    public RestResult<String> queryAiGenPic(@RequestParam("bookId") Long bookId) {
+        return RestResult.ok(bookService.queryAiGenPic(bookId));
+    }
+
     /**
      * AI扩写
      */
     @PostMapping("ai/expand")
     public RestResult<String> expandText(@RequestParam("text") String text, @RequestParam("ratio") Double ratio) {
-        String prompt = "请将以下文本扩写为原长度的" + ratio/100 + "倍：" + text;
+        String prompt = "请将以下文本扩写为原长度的" + ratio / 100 + "倍：" + text;
         return RestResult.ok(chatClient.prompt()
-                .user(prompt)
-                .call()
-                .content());
+            .user(prompt)
+            .call()
+            .content());
     }
 
     /**
@@ -241,11 +263,11 @@ public class AuthorController extends BaseController{
      */
     @PostMapping("ai/condense")
     public RestResult<String> condenseText(@RequestParam("text") String text, @RequestParam("ratio") Integer ratio) {
-        String prompt = "请将以下文本缩写为原长度的" + 100/ratio + "分之一：" + text;
+        String prompt = "请将以下文本缩写为原长度的" + 100 / ratio + "分之一：" + text;
         return RestResult.ok(chatClient.prompt()
-                .user(prompt)
-                .call()
-                .content());
+            .user(prompt)
+            .call()
+            .content());
     }
 
     /**
@@ -255,9 +277,9 @@ public class AuthorController extends BaseController{
     public RestResult<String> continueText(@RequestParam("text") String text, @RequestParam("length") Integer length) {
         String prompt = "请续写以下文本，续写长度约为" + length + "字：" + text;
         return RestResult.ok(chatClient.prompt()
-                .user(prompt)
-                .call()
-                .content());
+            .user(prompt)
+            .call()
+            .content());
     }
 
     /**
@@ -267,12 +289,57 @@ public class AuthorController extends BaseController{
     public RestResult<String> polishText(@RequestParam("text") String text) {
         String prompt = "请润色优化以下文本，保持原意：" + text;
         return RestResult.ok(chatClient.prompt()
-                .user(prompt)
-                .call()
-                .content());
+            .user(prompt)
+            .call()
+            .content());
     }
 
+    /**
+     * AI扩写
+     */
+    @GetMapping(value = "ai/stream/expand", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<String> streamExpandText(@RequestParam("text") String text, @RequestParam("ratio") Double ratio) {
+        String prompt = "请将以下文本扩写为原长度的" + ratio / 100 + "倍：" + text;
+        return chatClient.prompt()
+            .user(prompt)
+            .stream()
+            .content();
+    }
 
+    /**
+     * AI缩写
+     */
+    @GetMapping(value = "ai/stream/condense", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<String> streamCondenseText(@RequestParam("text") String text, @RequestParam("ratio") Integer ratio) {
+        String prompt = "请将以下文本缩写为原长度的" + 100 / ratio + "分之一：" + text;
+        return chatClient.prompt()
+            .user(prompt)
+            .stream()
+            .content();
+    }
 
+    /**
+     * AI续写
+     */
+    @GetMapping(value = "ai/stream/continue", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<String> streamContinueText(@RequestParam("text") String text, @RequestParam("length") Integer length) {
+        String prompt = "请续写以下文本，续写长度约为" + length + "字：" + text;
+        return chatClient.prompt()
+            .user(prompt)
+            .stream()
+            .content();
+    }
+
+    /**
+     * AI润色
+     */
+    @GetMapping(value = "/ai/stream/polish", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<String> streamPolishText(@RequestParam("text") String text) {
+        String prompt = "请润色优化以下文本，保持原意：" + text;
+        return chatClient.prompt()
+            .user(prompt)
+            .stream()
+            .content();
+    }
 
 }

novel-front/src/main/java/com/java2nb/novel/controller/BookController.java

@@ -2,12 +2,14 @@ package com.java2nb.novel.controller;
 
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.enums.ResponseStatus;
+import com.java2nb.novel.core.utils.IpUtil;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.BookCategory;
 import com.java2nb.novel.entity.BookComment;
 import com.java2nb.novel.entity.BookIndex;
 import com.java2nb.novel.service.BookContentService;
 import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.IpLocationService;
 import com.java2nb.novel.vo.BookCommentVO;
 import com.java2nb.novel.vo.BookSettingVO;
 import com.java2nb.novel.vo.BookSpVO;
@@ -37,6 +39,8 @@ public class BookController extends BaseController {
 
     private final Map<String, BookContentService> bookContentServiceMap;
 
+    private final IpLocationService ipLocationService;
+
     /**
      * 查询首页小说设置列表数据
      */
@@ -158,6 +162,7 @@ public class BookController extends BaseController {
         if (userDetails == null) {
             return RestResult.fail(ResponseStatus.NO_LOGIN);
         }
+        comment.setLocation(ipLocationService.getLocation(IpUtil.getRealIp(request)));
         bookService.addBookComment(userDetails.getId(), comment);
         return RestResult.ok();
     }

novel-front/src/main/java/com/java2nb/novel/controller/FileController.java

@@ -17,6 +17,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.client.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -61,11 +62,20 @@ public class FileController {
     /**
      * 图片上传
      *
-     * @return
+     * - 当使用 `$.ajax`发起异步请求时 ，设置`dataType: "json"`会在请求头中自动添加`Accept: application/json`，表示客户端期望服务器返回
+     *   `JSON`格式的数据。
+     * - 当使用 `$.ajaxFileUpload` 上传文件时，它的行为与`$.ajax`不同，不会自动修改`Accept`请求头，即使设置了`dataType: "json"`，
+     *   `$.ajaxFileUpload`也不会在请求头中添加`Accept: application/json`。
+     *
+     * Spring Boot 默认返回`JSON`格式的响应，但它支持内容协商，它会根据客户端请求的`Accept`头来决定返回的响应格式。
+     * 如果浏览器发送的请求中`Accept`头包含`application/xml`，并且 Spring Boot 支持`XML`格式响应的话，Spring Boot 会返回`XML`格式的响应。
+     * 但 Spring Boot 默认不支持`XML`格式的响应，当升级`Sharding-JDBC `版本后，自动引入了`jackson-dataformat-xml`依赖，才开始支持`XML`格式的响应，
+     * 由于`$.ajaxFileUpload`上传文件的默认`Accept`头包含`application/xml`，所以需要在后端上传文件接口处明确指定返回的数据类型为`application/json`。
+     *
      */
     @SneakyThrows
     @ResponseBody
-    @PostMapping("/picUpload")
+    @PostMapping(value = "/picUpload", produces = MediaType.APPLICATION_JSON_VALUE)
     RestResult<String> upload(@RequestParam("file") MultipartFile file) {
         Date currentDate = new Date();
         String savePath =

novel-front/src/main/java/com/java2nb/novel/core/config/AiConfig.java

@@ -18,16 +18,7 @@ import org.springframework.web.client.RestClient;
 public class AiConfig {
 
     /**
-     * 目的：配置自定义的 RestClientBuilder 对象
-     * <p>
-     * 原因：Spring AI 框架的 ChatClient 内部通过 RestClient（Spring Framework 6 和 Spring Boot 3 中引入） 发起 HTTP REST 请求与远程的大模型服务进行通信，
-     * 如果项目中没有配置自定义的 RestClientBuilder 对象， 那么在 RestClient 的自动配置类 org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration
-     * 中配置的 RestClientBuilder 对象会使用 Spring 容器中提供的 HttpMessageConverters， 由于本项目中配置了 spring.jackson.generator.write-numbers-as-strings
-     * = true， 所以 Spring 容器中的 HttpMessageConverters 在 RestClient 发起 HTTP REST 请求转换 Java 对象为 JSON 字符串时会自动将 Number 类型的
-     * Java 对象属性转换为字符串而导致请求参数错误
-     * <p>
-     * 示例："temperature": 0.7 =》"temperature": "0.7"
-     * {"code":20015,"message":"The parameter is invalid. Please check again.","data":null}
+     * 配置自定义的 RestClientBuilder 对象
      */
     @Bean
     public RestClient.Builder restClientBuilder() {

novel-front/src/main/java/com/java2nb/novel/core/config/IpLocationConfig.java

@@ -0,0 +1,55 @@
+package com.java2nb.novel.core.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.Searcher;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * IP 地址定位配置类
+ *
+ * @author xiongxiaoyang
+ * @date 2025/6/30
+ */
+@Slf4j
+@Configuration
+public class IpLocationConfig {
+
+    /**
+     * 使用 {@link Searcher} 实现高效的本地 IP 查询服务， 创建基于内存的 IP 地址查询对象，支持并发访问且仅需初始化一次。
+     *
+     * <p>该方法会将 ip2region.xdb 数据库文件加载到内存中，
+     * 并构建一个线程安全的 {@link Searcher} 实例，可用于高效、并发的 IP 地址定位查询。</p>
+     *
+     * <p>{@link Searcher} 实例是线程安全的，可以作为全局单例在整个应用中跨线程使用。</p>
+     *
+     * <p>通过配置 destroyMethod="close"，确保在 Spring 容器关闭时自动释放底层资源。</p>
+     */
+    @Bean(destroyMethod = "close")
+    public Searcher searcher() throws IOException {
+        // 1、从 classpath 加载整个 xdb 到内存。
+        try (InputStream inputStream = new ClassPathResource("ip2region.xdb").getInputStream()) {
+            File tempDbFile = File.createTempFile("ip2region", ".xdb");
+            try (FileOutputStream outputStream = new FileOutputStream(tempDbFile)) {
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+            }
+            // 确保程序退出时删除临时文件
+            tempDbFile.deleteOnExit();
+            byte[] cBuff = Searcher.loadContentFromFile(tempDbFile.getPath());
+
+            // 2、使用上述的 cBuff 创建一个完全基于内存的查询对象。
+            return Searcher.newWithBuffer(cBuff);
+        }
+    }
+
+}

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

@@ -290,4 +290,9 @@ public interface BookService {
      * @param authorId
      */
     void updateBookPic(Long bookId, String bookPic, Long authorId);
+
+    /**
+     * 查询AI生成图片
+     */
+    String queryAiGenPic(Long bookId);
 }

novel-front/src/main/java/com/java2nb/novel/service/IpLocationService.java

@@ -0,0 +1,24 @@
+package com.java2nb.novel.service;
+
+/**
+ * IP 地址定位服务类
+ *
+ * <p>该服务用于实现 IP 地址到地理位置的查询功能，
+ * 包括国家、省份、城市等信息。</p>
+ *
+ * <p>此类设计为 Spring 管理的 Service Bean，支持在 Controller 或其他 Service 中注入使用。</p>
+ *
+ * @author xiongxiaoyang
+ * @date 2025/6/30
+ */
+public interface IpLocationService {
+
+    /**
+     * 根据 IP 地址查询地理位置信息
+     *
+     * @param ip 待查询的 IP 地址（IPv4）
+     * @return 如果是中国 IP，返回省份；否则返回国家
+     */
+    String getLocation(String ip);
+
+}

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

@@ -7,6 +7,7 @@ import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.config.BookPriceProperties;
 import com.java2nb.novel.core.enums.ResponseStatus;
 import com.java2nb.novel.core.utils.Constants;
+import com.java2nb.novel.core.utils.FileUtil;
 import com.java2nb.novel.core.utils.StringUtil;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.entity.*;
@@ -27,10 +28,16 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.DateUtils;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
+import org.springframework.ai.image.Image;
+import org.springframework.ai.image.ImagePrompt;
+import org.springframework.ai.image.ImageResponse;
+import org.springframework.ai.openai.OpenAiImageModel;
+import org.springframework.ai.openai.OpenAiImageOptions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -39,13 +46,16 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.bookCategory;
+import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.sort;
 import static com.java2nb.novel.mapper.BookCommentDynamicSqlSupport.bookComment;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.bookContent;
 import static com.java2nb.novel.mapper.BookContentDynamicSqlSupport.content;
 import static com.java2nb.novel.mapper.BookDynamicSqlSupport.*;
+import static com.java2nb.novel.mapper.BookDynamicSqlSupport.book;
 import static com.java2nb.novel.mapper.BookIndexDynamicSqlSupport.bookIndex;
 import static com.java2nb.novel.mapper.BookSettingDynamicSqlSupport.bookSetting;
 import static org.mybatis.dynamic.sql.SqlBuilder.*;
@@ -87,6 +97,10 @@ public class BookServiceImpl implements BookService {
 
     private final BookPriceProperties bookPriceConfig;
 
+    private final OpenAiImageModel openAiImageModel;
+
+    private final ThreadPoolExecutor threadPoolExecutor;
+
     private final IdWorker idWorker = IdWorker.INSTANCE;
 
 
@@ -102,7 +116,7 @@ public class BookServiceImpl implements BookService {
             }
             result = new ObjectMapper().writeValueAsString(
                 list.stream().collect(Collectors.groupingBy(BookSettingVO::getType)));
-            cacheService.set(CacheKey.INDEX_BOOK_SETTINGS_KEY, result);
+            cacheService.set(CacheKey.INDEX_BOOK_SETTINGS_KEY, result, 3600 * 24);
         }
         return new ObjectMapper().readValue(result, Map.class);
     }
@@ -235,7 +249,7 @@ public class BookServiceImpl implements BookService {
             BookIndexDynamicSqlSupport.isVip)
             .from(bookIndex)
             .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId));
-        if("index_num desc".equals(orderBy)){
+        if ("index_num desc".equals(orderBy)) {
             where.orderBy(BookIndexDynamicSqlSupport.indexNum.descending());
         }
         return bookIndexMapper.selectMany(where
@@ -502,6 +516,7 @@ public class BookServiceImpl implements BookService {
 
     @Override
     public void addBook(Book book, Long authorId, String penName) {
+        book.setId(IdWorker.INSTANCE.nextId());
         //判断小说名是否存在
         if (queryIdByNameAndAuthor(book.getBookName(), penName) != null) {
             //该作者发布过此书名的小说
@@ -516,7 +531,37 @@ public class BookServiceImpl implements BookService {
         book.setCreateTime(new Date());
         book.setUpdateTime(book.getCreateTime());
         bookMapper.insertSelective(book);
-
+        if (Objects.isNull(book.getPicUrl()) || !book.getPicUrl().startsWith(Constants.LOCAL_PIC_PREFIX)) {
+            // 用户没有上传封面图片，AI自动生成封面图片
+            threadPoolExecutor.execute(() -> {
+                String prompt = String.format("生成一本小说的封面图片，图片中间显示书名《%s》，书名下方显示作者“%s 著”。",
+                    book.getBookName(), book.getAuthorName());
+                log.debug("prompt:{}", prompt);
+                ImageResponse response = openAiImageModel.call(
+                    new ImagePrompt(prompt,
+                        OpenAiImageOptions.builder()
+                            .quality("hd")
+                            .height(800)
+                            .width(600).build())
+                );
+                Image output = response.getResult().getOutput();
+                Date currentDate = new Date();
+                String picUrl = Constants.LOCAL_PIC_PREFIX +
+                    "aiGen/" + DateUtils.formatDate(currentDate, "yyyy") + "/" +
+                    DateUtils.formatDate(currentDate, "MM") + "/" +
+                    DateUtils.formatDate(currentDate, "dd") + "/" + book.getId() + ".png";
+                FileUtil.downloadFile(output.getUrl(), picSavePath + picUrl);
+                bookMapper.update(update(BookDynamicSqlSupport.book)
+                    .set(BookDynamicSqlSupport.picUrl)
+                    .equalTo(picUrl)
+                    .set(updateTime)
+                    .equalTo(currentDate)
+                    .where(id, isEqualTo(book.getId()))
+                    .build()
+                    .render(RenderingStrategies.MYBATIS3));
+                cacheService.set(CacheKey.AI_GEN_PIC + book.getId(), picUrl, 60 * 60);
+            });
+        }
     }
 
     @Override
@@ -838,5 +883,10 @@ public class BookServiceImpl implements BookService {
             .render(RenderingStrategies.MYBATIS3));
     }
 
+    @Override
+    public String queryAiGenPic(Long bookId) {
+        return cacheService.get(CacheKey.AI_GEN_PIC + bookId);
+    }
+
 
 }

novel-front/src/main/java/com/java2nb/novel/service/impl/IpLocationServiceImpl.java

@@ -0,0 +1,56 @@
+package com.java2nb.novel.service.impl;
+
+import com.java2nb.novel.core.utils.IpUtil;
+import com.java2nb.novel.service.IpLocationService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.Searcher;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+/**
+ * IpLocationService 实现类
+ *
+ * @author xiongxiaoyang
+ * @date 2025/6/30
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class IpLocationServiceImpl implements IpLocationService {
+
+    private final Searcher searcher;
+
+    @Override
+    public String getLocation(String ip) {
+        try {
+            // 示例返回："中国|0|湖北省|武汉市|电信"
+            String region = searcher.search(ip);
+            String[] regions = region.split("\\|");
+            if (regions.length > 0) {
+                // 国家
+                String country = regions[0];
+                if ("0".equals(country)) {
+                    // 内网IP，直接获取本机公网IP
+                    String publicIp = IpUtil.getPublicIP();
+                    log.info("内网IP：{}，本机公网IP：{}", ip, publicIp);
+                    if (StringUtils.hasText(publicIp)) {
+                        return getLocation(publicIp);
+                    }
+                } else if ("中国".equals(country)) {
+                    // 是中国，则返回省份（第三个字段）
+                    String province = regions.length > 2 ? regions[2] : "未知地区";
+                    // 去掉最后一个“省”字
+                    return province.endsWith("省") ? province.substring(0, province.length() - 1) : province;
+                } else {
+                    // 非中国，返回国家名
+                    return country;
+                }
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+        return "未知地区";
+    }
+
+}

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

@@ -48,13 +48,17 @@ book:
 spring:
   ai:
     openai:
-      api-key: sk-nnhjmxuljagcuubbovjztbhkiawqaabzziazeurppinxtgva
+      image:
+        enabled: true
+        base-url: https://api.siliconflow.cn
+        api-key: sk-jjtixmivxaccndqgkqfkbgkzvmbctdxogcrfbjzfttbouitt
+        options:
+          model: Kwai-Kolors/Kolors
+          response_format: URL
+      api-key: sk-jjtixmivxaccndqgkqfkbgkzvmbctdxogcrfbjzfttbouitt
       base-url: https://api.siliconflow.cn
       chat:
         options:
           model: deepseek-ai/DeepSeek-R1-Distill-Llama-8B
 
 
-
-
-

novel-front/src/main/resources/mybatis/mapping/BookCommentMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.java2nb.novel.mapper.FrontBookCommentMapper">
 
     <select id="listCommentByPage"  resultType="com.java2nb.novel.vo.BookCommentVO">
-        select t1.id,t1.book_id,t1.comment_content,t1.reply_count,t1.create_time,t2.username create_user_name,t2.user_photo create_user_photo
+        select t1.id,t1.book_id,t1.comment_content,t1.location,t1.reply_count,t1.create_time,t2.username create_user_name,t2.user_photo create_user_photo
         from book_comment t1 inner join user t2 on t1.create_user_id = t2.id
         <trim>
             <if test="bookId != null">

novel-front/src/main/resources/templates/author/content_add.html

@@ -15,7 +15,7 @@
                 padding: 20px;
                 background: #fff;
                 border-radius: 8px;
-                box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
             }
 
             /* 文本域样式 */
@@ -124,10 +124,10 @@
                                 <li id="contentLi" style="width: 500px">
                                     <div class="editor-container">
                                         <div class="ai-toolbar">
-                                            <a class="ai-link expand" data-type="expand">AI扩写</a>
-                                            <a class="ai-link condense" data-type="condense">AI缩写</a>
-                                            <a class="ai-link continue" data-type="continue">AI续写</a>
-                                            <a class="ai-link polish" data-type="polish">AI润色</a>
+                                            <a class="ai-link expand" data-type="stream/expand">AI扩写</a>
+                                            <a class="ai-link condense" data-type="stream/condense">AI缩写</a>
+                                            <a class="ai-link continue" data-type="stream/continue">AI续写</a>
+                                            <a class="ai-link polish" data-type="stream/polish">AI润色</a>
                                         </div>
                                         <textarea id="bookContent" name="bookContent"
                                                   placeholder="请输入文本内容..."></textarea>
@@ -268,7 +268,7 @@
         }, speed);
     }
 
-    $('.ai-toolbar .ai-link').click(function(e){
+    $('.ai-toolbar .ai-link').click(function (e) {
         e.preventDefault(); // 阻止默认链接行为
         const type = $(this).data('type');
         const textarea = $('#bookContent');
@@ -284,27 +284,27 @@
 
         // 参数配置
         let params = {text: selectedText};
-        if(type === 'expand' || type === 'condense'){
+        if (type === 'stream/expand' || type === 'stream/condense') {
             layer.prompt({
                 title: '请输入比例',
                 value: 2,
                 btn: ['确定', '取消'],
-                btn2: function(){
+                btn2: function () {
                     layer.close(loading);
                 },
-                cancel: function(){
+                cancel: function () {
                     layer.close(loading);
                 }
-            }, function(value, index){
-                if(isNaN(Number(value)) || isNaN(parseFloat(value))){
+            }, function (value, index) {
+                if (isNaN(Number(value)) || isNaN(parseFloat(value))) {
                     layer.msg('请输入正确的比例');
                     return;
                 }
-                if(type === 'expand' && value <= 1){
+                if (type === 'stream/expand' && value <= 1) {
                     layer.msg('请输入正确的比例');
                     return;
                 }
-                if(type === 'condense' && (value <=0 || value >= 1)){
+                if (type === 'stream/condense' && (value <= 0 || value >= 1)) {
                     layer.msg('请输入正确的比例');
                     return;
                 }
@@ -313,19 +313,19 @@
                 sendRequest(type, params, loading, textarea);
             });
             return;
-        }else if(type === 'continue'){
+        } else if (type === 'stream/continue') {
             layer.prompt({
                 title: '请输入续写长度（字数）',
                 value: 200,
                 btn: ['确定', '取消'],
-                btn2: function(){
+                btn2: function () {
                     layer.close(loading);
                 },
-                cancel: function(){
+                cancel: function () {
                     layer.close(loading);
                 }
-            }, function(value, index){
-                if(!Number.isInteger(Number(value)) || value <= 0){
+            }, function (value, index) {
+                if (!Number.isInteger(Number(value)) || value <= 0) {
                     layer.msg('请输入正确的长度');
                     return;
                 }
@@ -339,22 +339,28 @@
         sendRequest(type, params, loading, textarea);
     });
 
-    function sendRequest(type, params, loading, textarea){
-        $.ajax({
-            url: '/author/ai/' + type,
-            type: 'POST',
-            data: params,
-            success: function(res){
-                layer.close(loading);
-                // 将生成的内容追加到文本末尾
-                const newText = "\n\n" + res.data; // 添加换行符分隔
-                typeWriter(textarea, newText); // 使用打字机效果
-            },
-            error: function(){
-                layer.msg('请求失败，请稍后重试');
-                layer.close(loading);
-            }
-        });
+    function sendRequest(type, params, loading, textarea) {
+        const url = `/author/ai/${type}?text=${encodeURIComponent(params.text)}&ratio=${params.ratio}&length=${params.length}`;
+        const eventSource = new EventSource(url);
+
+        // 监听消息事件
+        eventSource.onmessage = function (event) {
+            layer.close(loading);
+            const data = event.data;
+            console.log('Received data:', data);
+
+            textarea.val(textarea.val() + data);
+            // 滚动到底部
+            textarea.scrollTop(textarea[0].scrollHeight);
+        };
+
+        // 监听错误事件
+        eventSource.onerror = function (error) {
+            layer.close(loading);
+            console.error('EventSource failed:', error);
+            eventSource.close(); // 关闭连接
+        };
+
     }
 
 </script>

novel-front/src/main/resources/templates/author/index.html

@@ -142,10 +142,12 @@
 <script src="/javascript/common.js" type="text/javascript"></script>
 
 <script language="javascript" type="text/javascript">
+    var coverUpdateInterval;
+
     search(1, 5);
 
     function search(curr, limit) {
-
+        clearInterval(coverUpdateInterval);
         $.ajax({
             type: "get",
             url: "/author/listBookByPage",
@@ -155,6 +157,25 @@
                 if (data.code == 200) {
                     var bookList = data.data.list;
                     if (bookList.length > 0) {
+                        if(curr == 1 && bookList[0].picUrl == '/images/default.gif'){
+                            coverUpdateInterval = setInterval(function(){
+                                $.ajax({
+                                    type: "get",
+                                    url: "/author/queryAiGenPic",
+                                    data: {'bookId': bookList[0].id},
+                                    dataType: "json",
+                                    success: function (data) {
+                                        if(data.code == 200 && data.data){
+                                            $("#cover"+bookList[0].id).attr("src", data.data);
+                                            clearInterval(coverUpdateInterval);
+                                        }
+                                    }
+                                  });
+                            }, 3000);
+                            setTimeout(() => {
+                                clearInterval(coverUpdateInterval);
+                            }, 10000);
+                        }
                         $("#hasContentDiv").css("display", "block");
                         $("#noContentDiv").css("display", "none");
                         var bookListHtml = "";
@@ -166,15 +187,12 @@
                                  "                            </td>\n" +*/
 
                                 "                            <td style=\"position: relative\" class=\"goread\">\n" +
-                                "<input class=\"opacity\" onchange=\"picChange('" + book.id + "'," + i + ")\"\n" +
-                                "                                           type=\"file\" id=\"file" + i + "\" name=\"file\"\n" +
+                                "<input class=\"opacity\" onchange=\"picChange('" + book.id + "')\"\n" +
+                                "                                           type=\"file\" id=\"file" + book.id + "\" name=\"file\"\n" +
                                 "                                           title=\"点击上传图片\"\n" +
                                 "                                           style=\"z-index: 100;cursor: pointer;left: 30px; top: 0px; width: 60px; height: 80px; opacity: 0; position: absolute;  \"\n" +
                                 "                                    />" +
-                                "<img width='50' height='70' src='" + book.picUrl + "'/><br/>" +
-                                "                                " + book.bookName + "</td>\n" +
-
-
+                                "<img id=\"cover" + book.id + "\" width='50' height='70' src='" + book.picUrl + "'/><br/>" +                                "                                " + book.bookName + "</td>\n" +
                                 "                            <td class=\"goread\" >"
                                 + book.catName + "</td>\n" +
 
@@ -277,19 +295,20 @@
     }
 
 
-    function picChange(bookId, i) {
-        var file = $("#file" + i).val(); //文件名称
+   function picChange(bookId) {
+        var file = $("#file" + bookId).val(); //文件名称
         if (file != "") {
-            if (checkPicUpload($("#file" + i)[0])) {
+            if (checkPicUpload($("#file" + bookId)[0])) {
 
                 $.ajaxFileUpload({
                     url: "/file/picUpload", //用于文件上传的服务器端请求地址
                     secureuri: false, //是否需要安全协议，一般设置为false
-                    fileElementId: "file" + i, //文件上传域的ID
+                    fileElementId: "file" + bookId, //文件上传域的ID
                     dataType: "json", //返回值类型 一般设置为json
                     type: "post",
                     success: function (data) { //服务器成功响应处理函数
                         if (data.code == 200) {
+                            let picUrl = data.data;
                             $.ajax({
                                 type: "POST",
                                 url: "/author/updateBookPic",
@@ -297,17 +316,13 @@
                                 dataType: "json",
                                 success: function (data) {
                                     if (data.code == 200) {
-
-                                        location.reload();
-
+                                        $("#cover"+bookId).attr("src", picUrl);
                                     } else {
-                                        lock = false;
                                         layer.alert(data.msg);
                                     }
 
                                 },
                                 error: function () {
-                                    lock = false;
                                     layer.alert('网络异常');
                                 }
                             })

novel-front/src/main/resources/templates/book/book_comment.html

@@ -135,7 +135,7 @@
                                 "<div class=\"user_heads fl\" vals=\"389\">" +
                                 "<img src=\""+(comment.createUserPhoto ? comment.createUserPhoto : '/images/man.png')+"\" class=\"user_head\" alt=\"\">" +
                                 "<span class=\"user_level1\" style=\"display: none;\">见习</span></div>" +
-                                "<ul class=\"pl_bar fr\">\t\t\t<li class=\"name\">"+(comment.createUserName.substr(0, 4) + "****" + comment.createUserName.substr(comment.createUserName.length - 3, 3))+"</li><li class=\"dec\">" +
+                                "<ul class=\"pl_bar fr\">\t\t\t<li class=\"name\">"+(comment.createUserName)+"<span style='padding-left: 10px' class=\"other\">"+(comment.location ? comment.location + "读者" : '')+"</span></li><li class=\"dec\">" +
                                 comment.commentContent+
                                 "</li><li class=\"other cf\">" +
                                 "<span class=\"time fl\">"+comment.createTime+"</span>" +

novel-front/src/main/resources/templates/book/book_detail.html

@@ -95,7 +95,7 @@
                             <span class="block">暂无评论</span>
                         </div>
                         <div class="commentBar" id="commentPanel" th:style="${bookCommentPageBean.total == 0}? 'display:none'">
-                            <div th:each="comment: ${bookCommentPageBean.list}" class="comment_list cf"><div class="user_heads fl" vals="389"><img th:src="${comment.createUserPhoto}?${comment.createUserPhoto}:'/images/man.png'" class="user_head" alt=""><span class="user_level1" style="display: none;">见习</span></div><ul class="pl_bar fr">			<li class="name" th:text="${#strings.substring(comment.createUserName,0,4)}+'****'+${#strings.substring(comment.createUserName,#strings.length(comment.createUserName)-3,#strings.length(comment.createUserName))}"></li><li class="dec" th:utext="${comment.commentContent}"></li><li class="other cf"><span class="time fl" th:text="${#calendars.format(comment.createTime, 'yyyy-MM-dd HH:mm:ss')}"></span><span class="fr"><a href="javascript:void(0);" onclick="javascript:BookDetail.AddAgreeTotal(77,this);" class="zan" style="display: none;">赞<i class="num">(0)</i></a></span></li>		</ul>	</div>
+                            <div th:each="comment: ${bookCommentPageBean.list}" class="comment_list cf"><div class="user_heads fl" vals="389"><img th:src="${comment.createUserPhoto}?${comment.createUserPhoto}:'/images/man.png'" class="user_head" alt=""><span class="user_level1" style="display: none;">见习</span></div><ul class="pl_bar fr">			<li class="name"><span th:text="${#strings.substring(comment.createUserName,0,4)}+'****'+${#strings.substring(comment.createUserName,#strings.length(comment.createUserName)-3,#strings.length(comment.createUserName))}"></span><span style="padding-left: 10px" class="other" th:if="${comment.location}" th:text="${comment.location} + '读者'"></span></span></li><li class="dec" th:utext="${comment.commentContent}"></li><li class="other cf"><span class="time fl" th:text="${#calendars.format(comment.createTime, 'yyyy-MM-dd HH:mm:ss')}"></span><span class="fr"><a href="javascript:void(0);" onclick="javascript:BookDetail.AddAgreeTotal(77,this);" class="zan" style="display: none;">赞<i class="num">(0)</i></a></span></li>		</ul>	</div>
 
                         </div>
 
@@ -319,7 +319,7 @@
                                 "<div class=\"user_heads fl\" vals=\"389\">" +
                                 "<img src=\""+(comment.createUserPhoto ? comment.createUserPhoto : '/images/man.png')+"\" class=\"user_head\" alt=\"\">" +
                                 "<span class=\"user_level1\" style=\"display: none;\">见习</span></div>" +
-                                "<ul class=\"pl_bar fr\">\t\t\t<li class=\"name\">"+(comment.createUserName)+"</li><li class=\"dec\">" +
+                                "<ul class=\"pl_bar fr\">\t\t\t<li class=\"name\">"+(comment.createUserName)+"<span style='padding-left: 10px' class=\"other\">"+(comment.location ? comment.location + "读者" : '')+"</span></li><li class=\"dec\">" +
                                 comment.commentContent+
                                 "</li><li class=\"other cf\">" +
                                 "<span class=\"time fl\">"+comment.createTime+"</span>" +

novel-front/src/main/resources/templates/mobile/user/favorites.html

@@ -22,25 +22,19 @@
 
         body {
 
-  -webkit-user-select: none; /* Chrome, Safari, Opera */
+            -webkit-user-select: none; /* Chrome, Safari, Opera */
 
 
-  -moz-user-select: none;    /* Firefox */
-
-
-  -ms-user-select: none;     /* Internet Explorer/Edge */
-
-
-  user-select: none;         /* Non-prefixed version, currently supported by Chrome, Opera, and Firefox */
-
-
-}
+            -moz-user-select: none; /* Firefox */
 
 
+            -ms-user-select: none; /* Internet Explorer/Edge */
 
 
+            user-select: none; /* Non-prefixed version, currently supported by Chrome, Opera, and Firefox */
 
 
+        }
 
 
         .line-limit-length {
@@ -84,16 +78,16 @@
             height: 180px;
         }
 
-  #tipLayer {
-    display: none;
-    position: absolute;
-    background-color: rgba(255, 0, 0, 0.8);
-    color: white;
-    padding: 5px 10px;
-    border-radius: 3px;
-    cursor: pointer;
-    z-index: 1000;
-}
+        #tipLayer {
+            display: none;
+            position: absolute;
+            background-color: rgba(255, 0, 0, 0.8);
+            color: white;
+            padding: 5px 10px;
+            border-radius: 3px;
+            cursor: pointer;
+            z-index: 1000;
+        }
 
     </style>
 </head>
@@ -173,7 +167,7 @@
                             book.bookDesc = book.bookDesc.replace(/<[^>]+>/g, "").replace(/\s+/g, "").replace(/&nbsp;/g, "");
                         }
 
-                        bookListHtml += ("<div id='"+book.bookId+"' onclick='read(\""+book.bookId+"\",\""+book.preContentId+"\")' class=\"item layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
+                        bookListHtml += ("<div id='" + book.bookId + "' onclick='read(\"" + book.bookId + "\",\"" + book.preContentId + "\")' class=\"item layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
                             "            <div class=\"layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2\" style=\"text-align: center\">\n" +
                             "                <img style='width: 130px;height: 180px' align=\"center\"\n" +
                             "                     src=\"" + book.picUrl + "\"/>\n" +
@@ -197,40 +191,38 @@
                     $("#bookList").html(bookListHtml);
 
 
-$(".item").on('touchstart', function(e) {
-        var element = $(this);
-        // 清除可能存在的定时器
-        clearTimeout(timeout);
-        isLongPress = false;
+                    $(".item").on('touchstart', function (e) {
+                        var element = $(this);
+                        // 清除可能存在的定时器
+                        clearTimeout(timeout);
+                        isLongPress = false;
 
-        // 获取触摸点位置
-        var touch = e.originalEvent.touches[0];
-
-        // 设置一个定时器，在500ms后触发（可以根据需要调整时间）
-        timeout = setTimeout(function() {
-            e.preventDefault();
-            showTip(touch, element);
-        }, 1000);
-    }).on('touchend', function(e) {
-        if (!isLongPress) {
-            // 如果没有发生长按，则执行点击事件的逻辑
-            clearTimeout(timeout);
-        }
-    }).on('touchmove', function() {
-        clearTimeout(timeout);
-        hideTip();
-    }).on('contextmenu', function(e) {
-        e.preventDefault();
-    });
-
-    $('#tipLayer').click(function() {
-        // 点击tips层时删除对应的.item元素
-        removeFromBookShelf($(this).data('target').attr("id"));
-        $(this).data('target').remove();
-        hideTip();
-    });
+                        // 获取触摸点位置
+                        var touch = e.originalEvent.touches[0];
 
+                        // 设置一个定时器，在500ms后触发（可以根据需要调整时间）
+                        timeout = setTimeout(function () {
+                            e.preventDefault();
+                            showTip(touch, element);
+                        }, 1000);
+                    }).on('touchend', function (e) {
+                        if (!isLongPress) {
+                            // 如果没有发生长按，则执行点击事件的逻辑
+                            clearTimeout(timeout);
+                        }
+                    }).on('touchmove', function () {
+                        clearTimeout(timeout);
+                        hideTip();
+                    }).on('contextmenu', function (e) {
+                        e.preventDefault();
+                    });
 
+                    $('#tipLayer').click(function () {
+                        // 点击tips层时删除对应的.item元素
+                        removeFromBookShelf($(this).data('target').attr("id"));
+                        $(this).data('target').remove();
+                        hideTip();
+                    });
 
 
                     layui.use('laypage', function () {
@@ -272,7 +264,7 @@ $(".item").on('touchstart', function(e) {
     }
 
     function showTip(touchEvent, element) {
-    isLongPress = true;
+        isLongPress = true;
         // 根据触摸点位置设置弹出层的位置
         $('#tipLayer')
             .css({
@@ -284,7 +276,7 @@ $(".item").on('touchstart', function(e) {
     }
 
     function hideTip() {
-    isLongPress = false;
+        isLongPress = false;
         $('#tipLayer').hide().removeData('target'); // 隐藏tips并清除数据
     }
 
@@ -333,11 +325,11 @@ $(".item").on('touchstart', function(e) {
         searchByAllCondition(1, 20, keywords);
     }
 
-    function read(bookId,contentId){
-    if(isLongPress){
-     return false;
-    }
-        location.href = '/book/'+bookId+"/"+contentId+".html"
+    function read(bookId, contentId) {
+        if (isLongPress) {
+            return false;
+        }
+        location.href = '/book/' + bookId + "/" + contentId + ".html"
         hideTip();
     }
 
@@ -347,19 +339,19 @@ $(".item").on('touchstart', function(e) {
 
     function removeFromBookShelf(bookId) {
 
-         $.ajax({
-             type: "delete",
-             url: "/user/removeFromBookShelf/" + bookId,
-             data: {},
-             dataType: "json",
-             success: function (data) {
-                 if (data.code == 200) {
-                     $("#shelf" + bookId).remove();
-                 }
-             }
-         });
+        $.ajax({
+            type: "delete",
+            url: "/user/removeFromBookShelf/" + bookId,
+            data: {},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    $("#shelf" + bookId).remove();
+                }
+            }
+        });
 
-     }
+    }
 
 
 </script>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>5.0.1</version>
+    <version>5.1.5</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>

templates/green/html/author/content_add.html

@@ -15,7 +15,7 @@
                 padding: 20px;
                 background: #fff;
                 border-radius: 8px;
-                box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+                box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
             }
 
             /* 文本域样式 */
@@ -124,10 +124,10 @@
                                 <li id="contentLi" style="width: 500px">
                                     <div class="editor-container">
                                         <div class="ai-toolbar">
-                                            <a class="ai-link expand" data-type="expand">AI扩写</a>
-                                            <a class="ai-link condense" data-type="condense">AI缩写</a>
-                                            <a class="ai-link continue" data-type="continue">AI续写</a>
-                                            <a class="ai-link polish" data-type="polish">AI润色</a>
+                                            <a class="ai-link expand" data-type="stream/expand">AI扩写</a>
+                                            <a class="ai-link condense" data-type="stream/condense">AI缩写</a>
+                                            <a class="ai-link continue" data-type="stream/continue">AI续写</a>
+                                            <a class="ai-link polish" data-type="stream/polish">AI润色</a>
                                         </div>
                                         <textarea id="bookContent" name="bookContent"
                                                   placeholder="请输入文本内容..."></textarea>
@@ -268,7 +268,7 @@
         }, speed);
     }
 
-    $('.ai-toolbar .ai-link').click(function(e){
+    $('.ai-toolbar .ai-link').click(function (e) {
         e.preventDefault(); // 阻止默认链接行为
         const type = $(this).data('type');
         const textarea = $('#bookContent');
@@ -284,27 +284,27 @@
 
         // 参数配置
         let params = {text: selectedText};
-        if(type === 'expand' || type === 'condense'){
+        if (type === 'stream/expand' || type === 'stream/condense') {
             layer.prompt({
                 title: '请输入比例',
                 value: 2,
                 btn: ['确定', '取消'],
-                btn2: function(){
+                btn2: function () {
                     layer.close(loading);
                 },
-                cancel: function(){
+                cancel: function () {
                     layer.close(loading);
                 }
-            }, function(value, index){
-                if(isNaN(Number(value)) || isNaN(parseFloat(value))){
+            }, function (value, index) {
+                if (isNaN(Number(value)) || isNaN(parseFloat(value))) {
                     layer.msg('请输入正确的比例');
                     return;
                 }
-                if(type === 'expand' && value <= 1){
+                if (type === 'stream/expand' && value <= 1) {
                     layer.msg('请输入正确的比例');
                     return;
                 }
-                if(type === 'condense' && (value <=0 || value >= 1)){
+                if (type === 'stream/condense' && (value <= 0 || value >= 1)) {
                     layer.msg('请输入正确的比例');
                     return;
                 }
@@ -313,19 +313,19 @@
                 sendRequest(type, params, loading, textarea);
             });
             return;
-        }else if(type === 'continue'){
+        } else if (type === 'stream/continue') {
             layer.prompt({
                 title: '请输入续写长度（字数）',
                 value: 200,
                 btn: ['确定', '取消'],
-                btn2: function(){
+                btn2: function () {
                     layer.close(loading);
                 },
-                cancel: function(){
+                cancel: function () {
                     layer.close(loading);
                 }
-            }, function(value, index){
-                if(!Number.isInteger(Number(value)) || value <= 0){
+            }, function (value, index) {
+                if (!Number.isInteger(Number(value)) || value <= 0) {
                     layer.msg('请输入正确的长度');
                     return;
                 }
@@ -339,22 +339,28 @@
         sendRequest(type, params, loading, textarea);
     });
 
-    function sendRequest(type, params, loading, textarea){
-        $.ajax({
-            url: '/author/ai/' + type,
-            type: 'POST',
-            data: params,
-            success: function(res){
-                layer.close(loading);
-                // 将生成的内容追加到文本末尾
-                const newText = "\n\n" + res.data; // 添加换行符分隔
-                typeWriter(textarea, newText); // 使用打字机效果
-            },
-            error: function(){
-                layer.msg('请求失败，请稍后重试');
-                layer.close(loading);
-            }
-        });
+    function sendRequest(type, params, loading, textarea) {
+        const url = `/author/ai/${type}?text=${encodeURIComponent(params.text)}&ratio=${params.ratio}&length=${params.length}`;
+        const eventSource = new EventSource(url);
+
+        // 监听消息事件
+        eventSource.onmessage = function (event) {
+            layer.close(loading);
+            const data = event.data;
+            console.log('Received data:', data);
+
+            textarea.val(textarea.val() + data);
+            // 滚动到底部
+            textarea.scrollTop(textarea[0].scrollHeight);
+        };
+
+        // 监听错误事件
+        eventSource.onerror = function (error) {
+            layer.close(loading);
+            console.error('EventSource failed:', error);
+            eventSource.close(); // 关闭连接
+        };
+
     }
 
 </script>

templates/green/html/author/index.html

@@ -51,7 +51,8 @@
         </div>
         <div class="my_r">
             <div id="noContentDiv">
-                <div class="tc" style="margin-top: 200px"><a href="/author/book_add.html" class="btn_red">创建作品</a></div>
+                <div class="tc" style="margin-top: 200px"><a href="/author/book_add.html" class="btn_red">创建作品</a>
+                </div>
 
             </div>
             <div class="my_bookshelf" id="hasContentDiv" style="display: none">
@@ -142,10 +143,13 @@
 <script src="/javascript/common.js" type="text/javascript"></script>
 
 <script language="javascript" type="text/javascript">
+    var searchCount = 0;
+    var timeout;
     search(1, 5);
 
     function search(curr, limit) {
-
+        searchCount++;
+        clearTimeout(timeout);
         $.ajax({
             type: "get",
             url: "/author/listBookByPage",
@@ -155,6 +159,7 @@
                 if (data.code == 200) {
                     var bookList = data.data.list;
                     if (bookList.length > 0) {
+                        var aiPicGenerating = bookList[0].picUrl == '/images/default.gif'
                         $("#hasContentDiv").css("display", "block");
                         $("#noContentDiv").css("display", "none");
                         var bookListHtml = "";
@@ -226,6 +231,12 @@
                             });
                         });
 
+                        if (curr === 1 && aiPicGenerating && searchCount < 10) {
+                            timeout = setTimeout(function () {
+                                search(curr, limit);
+                            }, 3000);
+                        }
+
                     }
 
 

templates/green/html/mobile/user/favorites.html

@@ -22,25 +22,19 @@
 
         body {
 
-  -webkit-user-select: none; /* Chrome, Safari, Opera */
+            -webkit-user-select: none; /* Chrome, Safari, Opera */
 
 
-  -moz-user-select: none;    /* Firefox */
-
-
-  -ms-user-select: none;     /* Internet Explorer/Edge */
-
-
-  user-select: none;         /* Non-prefixed version, currently supported by Chrome, Opera, and Firefox */
-
-
-}
+            -moz-user-select: none; /* Firefox */
 
 
+            -ms-user-select: none; /* Internet Explorer/Edge */
 
 
+            user-select: none; /* Non-prefixed version, currently supported by Chrome, Opera, and Firefox */
 
 
+        }
 
 
         .line-limit-length {
@@ -84,16 +78,16 @@
             height: 180px;
         }
 
-  #tipLayer {
-    display: none;
-    position: absolute;
-    background-color: rgba(255, 0, 0, 0.8);
-    color: white;
-    padding: 5px 10px;
-    border-radius: 3px;
-    cursor: pointer;
-    z-index: 1000;
-}
+        #tipLayer {
+            display: none;
+            position: absolute;
+            background-color: rgba(255, 0, 0, 0.8);
+            color: white;
+            padding: 5px 10px;
+            border-radius: 3px;
+            cursor: pointer;
+            z-index: 1000;
+        }
 
     </style>
 </head>
@@ -173,7 +167,7 @@
                             book.bookDesc = book.bookDesc.replace(/<[^>]+>/g, "").replace(/\s+/g, "").replace(/&nbsp;/g, "");
                         }
 
-                        bookListHtml += ("<div id='"+book.bookId+"' onclick='read(\""+book.bookId+"\",\""+book.preContentId+"\")' class=\"item layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
+                        bookListHtml += ("<div id='" + book.bookId + "' onclick='read(\"" + book.bookId + "\",\"" + book.preContentId + "\")' class=\"item layui-row\" style=\"margin-bottom:10px;padding:10px;background: #f2f2f2\">\n" +
                             "            <div class=\"layui-col-xs6 layui-col-sm3 layui-col-md2 layui-col-lg2\" style=\"text-align: center\">\n" +
                             "                <img style='width: 130px;height: 180px' align=\"center\"\n" +
                             "                     src=\"" + book.picUrl + "\"/>\n" +
@@ -197,40 +191,38 @@
                     $("#bookList").html(bookListHtml);
 
 
-$(".item").on('touchstart', function(e) {
-        var element = $(this);
-        // 清除可能存在的定时器
-        clearTimeout(timeout);
-        isLongPress = false;
+                    $(".item").on('touchstart', function (e) {
+                        var element = $(this);
+                        // 清除可能存在的定时器
+                        clearTimeout(timeout);
+                        isLongPress = false;
 
-        // 获取触摸点位置
-        var touch = e.originalEvent.touches[0];
-
-        // 设置一个定时器，在500ms后触发（可以根据需要调整时间）
-        timeout = setTimeout(function() {
-            e.preventDefault();
-            showTip(touch, element);
-        }, 1000);
-    }).on('touchend', function(e) {
-        if (!isLongPress) {
-            // 如果没有发生长按，则执行点击事件的逻辑
-            clearTimeout(timeout);
-        }
-    }).on('touchmove', function() {
-        clearTimeout(timeout);
-        hideTip();
-    }).on('contextmenu', function(e) {
-        e.preventDefault();
-    });
-
-    $('#tipLayer').click(function() {
-        // 点击tips层时删除对应的.item元素
-        removeFromBookShelf($(this).data('target').attr("id"));
-        $(this).data('target').remove();
-        hideTip();
-    });
+                        // 获取触摸点位置
+                        var touch = e.originalEvent.touches[0];
 
+                        // 设置一个定时器，在500ms后触发（可以根据需要调整时间）
+                        timeout = setTimeout(function () {
+                            e.preventDefault();
+                            showTip(touch, element);
+                        }, 1000);
+                    }).on('touchend', function (e) {
+                        if (!isLongPress) {
+                            // 如果没有发生长按，则执行点击事件的逻辑
+                            clearTimeout(timeout);
+                        }
+                    }).on('touchmove', function () {
+                        clearTimeout(timeout);
+                        hideTip();
+                    }).on('contextmenu', function (e) {
+                        e.preventDefault();
+                    });
 
+                    $('#tipLayer').click(function () {
+                        // 点击tips层时删除对应的.item元素
+                        removeFromBookShelf($(this).data('target').attr("id"));
+                        $(this).data('target').remove();
+                        hideTip();
+                    });
 
 
                     layui.use('laypage', function () {
@@ -272,7 +264,7 @@ $(".item").on('touchstart', function(e) {
     }
 
     function showTip(touchEvent, element) {
-    isLongPress = true;
+        isLongPress = true;
         // 根据触摸点位置设置弹出层的位置
         $('#tipLayer')
             .css({
@@ -284,7 +276,7 @@ $(".item").on('touchstart', function(e) {
     }
 
     function hideTip() {
-    isLongPress = false;
+        isLongPress = false;
         $('#tipLayer').hide().removeData('target'); // 隐藏tips并清除数据
     }
 
@@ -333,11 +325,11 @@ $(".item").on('touchstart', function(e) {
         searchByAllCondition(1, 20, keywords);
     }
 
-    function read(bookId,contentId){
-    if(isLongPress){
-     return false;
-    }
-        location.href = '/book/'+bookId+"/"+contentId+".html"
+    function read(bookId, contentId) {
+        if (isLongPress) {
+            return false;
+        }
+        location.href = '/book/' + bookId + "/" + contentId + ".html"
         hideTip();
     }
 
@@ -347,19 +339,19 @@ $(".item").on('touchstart', function(e) {
 
     function removeFromBookShelf(bookId) {
 
-         $.ajax({
-             type: "delete",
-             url: "/user/removeFromBookShelf/" + bookId,
-             data: {},
-             dataType: "json",
-             success: function (data) {
-                 if (data.code == 200) {
-                     $("#shelf" + bookId).remove();
-                 }
-             }
-         });
+        $.ajax({
+            type: "delete",
+            url: "/user/removeFromBookShelf/" + bookId,
+            data: {},
+            dataType: "json",
+            success: function (data) {
+                if (data.code == 200) {
+                    $("#shelf" + bookId).remove();
+                }
+            }
+        });
 
-     }
+    }
 
 
 </script>