mirror of
https://github.com/201206030/novel-plus.git
synced 2025-07-01 07:16:39 +00:00
Compare commits
10 Commits
v5.1.3
...
develop_xx
Author | SHA1 | Date | |
---|---|---|---|
4693c7ffae | |||
efb136e3be | |||
7955db0e3c | |||
60dc28c5ed | |||
1534220f0c | |||
0830f6ffeb | |||
adc83db64e | |||
9c11f22816 | |||
24abe7714f | |||
a9fc80eba1 |
15
README.md
15
README.md
@ -9,7 +9,7 @@
|
|||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p align="center">
|
<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>
|
</p>
|
||||||
|
|
||||||
## 项目介绍
|
## 项目介绍
|
||||||
@ -21,8 +21,8 @@ TXT 文本存储)、阅读主题切换、多爬虫源自动采集和更新数
|
|||||||
## 项目地址
|
## 项目地址
|
||||||
|
|
||||||
- 学习版:[GitHub](https://github.com/201206030/novel) | [码云](https://gitee.com/novel_dev_team/novel)
|
- 学习版:[GitHub](https://github.com/201206030/novel) | [码云](https://gitee.com/novel_dev_team/novel)
|
||||||
| [保姆级教程](https://docs.xxyopen.com)
|
| [保姆级教程](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)
|
- 微服务版:[GitHub](https://github.com/201206030/novel-cloud) | [码云](https://gitee.com/novel_dev_team/novel-cloud)
|
||||||
|
|
||||||
## 项目结构
|
## 项目结构
|
||||||
@ -77,14 +77,11 @@ novel-plus 5.x 已集成 Spring 官方最新发布的 Spring AI 框架,并推
|
|||||||
1. v5.0.0 版本在小说章节发布页面的文本编辑器中集成了多项智能编辑功能,包括 AI 扩写、缩写、续写及文本润色等。这些功能的设计灵感来源于百家号文章编辑器中的 AI 助手。
|
1. v5.0.0 版本在小说章节发布页面的文本编辑器中集成了多项智能编辑功能,包括 AI 扩写、缩写、续写及文本润色等。这些功能的设计灵感来源于百家号文章编辑器中的 AI 助手。
|
||||||
2. v5.1.0 版本在小说发布页面,新增 AI 生成封面图功能。若作家未上传自定义封面图,系统将根据小说信息自动生成封面图。
|
2. v5.1.0 版本在小说发布页面,新增 AI 生成封面图功能。若作家未上传自定义封面图,系统将根据小说信息自动生成封面图。
|
||||||
|
|
||||||
目前,AI 功能仍处于实验阶段,仅实现了基础的核心功能。我们非常重视用户的实际使用体验和反馈,未来将根据用户需求和使用情况,持续优化和调整该功能。如果用户反馈积极,我们计划进一步开发更高级的
|
目前,AI 功能仍处于实验阶段,仅实现了基础的核心功能。我们非常重视用户的实际使用体验和反馈,未来将根据用户需求和使用情况,持续优化和调整该功能。如果用户反馈积极,我们计划进一步开发更高级的 AI 功能,例如自动生成有声小说、智能情节推荐等,以全面提升 novel-plus 的创作能力和用户体验。
|
||||||
AI 功能,例如自动生成有声小说、智能情节推荐等,以全面提升 novel-plus 的创作能力和用户体验。
|
|
||||||
|
|
||||||
我们将持续关注 AI 技术的发展,并致力于将其与小说创作场景深度融合,为用户带来更智能、更便捷的创作工具。
|
我们将持续关注 AI 技术的发展,并致力于将其与小说创作场景深度融合,为用户带来更智能、更便捷的创作工具。
|
||||||
|
|
||||||
由于 DeepSeek 官方 API 目前不可用,novel-plus 项目默认使用的是第三方[硅基流动](https://cloud.siliconflow.cn/i/DOgMRH9S)
|
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 写作功能。
|
||||||
提供的 API,采用的 AI 模型有对话模型`deepseek-ai/DeepSeek-R1-Distill-Llama-8B`(DeepSeek-R1 的蒸馏版本,免费使用)和生图模型`Kwai-Kolors/Kolors`(快手 Kolors 团队开发的文本到图像生成模型,免费使用)。只需注册一个硅基流动账号,创建一个
|
|
||||||
API 密钥,并将其添加到 novel-plus 项目 novel-front 模块的 yaml 配置文件中,即可体验 novel-plus 项目的 AI 写作功能。
|
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
spring:
|
spring:
|
||||||
@ -104,7 +101,7 @@ spring:
|
|||||||
model: deepseek-ai/DeepSeek-R1-Distill-Llama-8B
|
model: deepseek-ai/DeepSeek-R1-Distill-Llama-8B
|
||||||
```
|
```
|
||||||
|
|
||||||
> ⚠️ novel-plus 项目默认使用的都是免费 AI 模型,生成效果有限。如果对生成内容有更高的要求,建议选用付费的 AI 模型。
|
⚠️ novel-plus 项目默认使用的都是免费 AI 模型,生成效果有限。如果对生成内容有更高的要求,建议选用付费的 AI 模型。
|
||||||
|
|
||||||
## 增值服务
|
## 增值服务
|
||||||
|
|
||||||
|
3
doc/sql/20250630.sql
Normal file
3
doc/sql/20250630.sql
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
alter table book_comment add column location varchar(50) DEFAULT NULL COMMENT '地理位置' after comment_content ;
|
||||||
|
|
||||||
|
|
@ -3153,4 +3153,9 @@ where menu_id = 104;
|
|||||||
|
|
||||||
delete
|
delete
|
||||||
from sys_menu
|
from sys_menu
|
||||||
where menu_id = 57;
|
where menu_id = 57;
|
||||||
|
|
||||||
|
|
||||||
|
alter table book_comment add column location varchar(50) DEFAULT NULL COMMENT '地理位置' after comment_content ;
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>com.java2nb</groupId>
|
<groupId>com.java2nb</groupId>
|
||||||
<artifactId>novel-admin</artifactId>
|
<artifactId>novel-admin</artifactId>
|
||||||
<version>5.1.3</version>
|
<version>5.1.5</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>novel-admin</name>
|
<name>novel-admin</name>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>novel</artifactId>
|
<artifactId>novel</artifactId>
|
||||||
<groupId>com.java2nb</groupId>
|
<groupId>com.java2nb</groupId>
|
||||||
<version>5.1.3</version>
|
<version>5.1.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -5,8 +5,8 @@ import org.springframework.http.*;
|
|||||||
import org.springframework.web.client.RestTemplate;
|
import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import java.nio.charset.Charset;
|
import java.nio.charset.Charset;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Administrator
|
* @author Administrator
|
||||||
@ -16,7 +16,7 @@ public class HttpUtil {
|
|||||||
|
|
||||||
private static final String DEFAULT_CHARSET = "utf-8";
|
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) {
|
public static String getByHttpClientWithChrome(String url, String charset) {
|
||||||
log.debug("Get url:{}", url);
|
log.debug("Get url:{}", url);
|
||||||
|
@ -1,11 +1,21 @@
|
|||||||
package com.java2nb.novel.core.utils;
|
package com.java2nb.novel.core.utils;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
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 {
|
public class IpUtil {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取真实IP
|
* 获取真实IP
|
||||||
|
*
|
||||||
* @param request 请求体
|
* @param request 请求体
|
||||||
* @return 真实IP
|
* @return 真实IP
|
||||||
*/
|
*/
|
||||||
@ -31,4 +41,27 @@ public class IpUtil {
|
|||||||
}
|
}
|
||||||
return ip;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,6 +14,9 @@ public class BookComment {
|
|||||||
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
private String commentContent;
|
private String commentContent;
|
||||||
|
|
||||||
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
|
private String location;
|
||||||
|
|
||||||
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
private Integer replyCount;
|
private Integer replyCount;
|
||||||
|
|
||||||
@ -56,6 +59,16 @@ public class BookComment {
|
|||||||
this.commentContent = commentContent == null ? null : commentContent.trim();
|
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")
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
public Integer getReplyCount() {
|
public Integer getReplyCount() {
|
||||||
return replyCount;
|
return replyCount;
|
||||||
|
@ -19,6 +19,9 @@ public final class BookCommentDynamicSqlSupport {
|
|||||||
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
public static final SqlColumn<String> commentContent = bookComment.commentContent;
|
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")
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
public static final SqlColumn<Integer> replyCount = bookComment.replyCount;
|
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> 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<Integer> replyCount = column("reply_count", JDBCType.INTEGER);
|
||||||
|
|
||||||
public final SqlColumn<Byte> auditStatus = column("audit_status", JDBCType.TINYINT);
|
public final SqlColumn<Byte> auditStatus = column("audit_status", JDBCType.TINYINT);
|
||||||
|
@ -29,7 +29,7 @@ import static org.mybatis.dynamic.sql.SqlBuilder.isEqualTo;
|
|||||||
@Mapper
|
@Mapper
|
||||||
public interface BookCommentMapper {
|
public interface BookCommentMapper {
|
||||||
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
@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")
|
@Generated("org.mybatis.generator.api.MyBatisGenerator")
|
||||||
@SelectProvider(type=SqlProviderAdapter.class, method="select")
|
@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="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
|
||||||
@Result(column="book_id", property="bookId", jdbcType=JdbcType.BIGINT),
|
@Result(column="book_id", property="bookId", jdbcType=JdbcType.BIGINT),
|
||||||
@Result(column="comment_content", property="commentContent", jdbcType=JdbcType.VARCHAR),
|
@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="reply_count", property="replyCount", jdbcType=JdbcType.INTEGER),
|
||||||
@Result(column="audit_status", property="auditStatus", jdbcType=JdbcType.TINYINT),
|
@Result(column="audit_status", property="auditStatus", jdbcType=JdbcType.TINYINT),
|
||||||
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
|
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
|
||||||
@ -92,6 +93,7 @@ public interface BookCommentMapper {
|
|||||||
c.map(id).toProperty("id")
|
c.map(id).toProperty("id")
|
||||||
.map(bookId).toProperty("bookId")
|
.map(bookId).toProperty("bookId")
|
||||||
.map(commentContent).toProperty("commentContent")
|
.map(commentContent).toProperty("commentContent")
|
||||||
|
.map(location).toProperty("location")
|
||||||
.map(replyCount).toProperty("replyCount")
|
.map(replyCount).toProperty("replyCount")
|
||||||
.map(auditStatus).toProperty("auditStatus")
|
.map(auditStatus).toProperty("auditStatus")
|
||||||
.map(createTime).toProperty("createTime")
|
.map(createTime).toProperty("createTime")
|
||||||
@ -105,6 +107,7 @@ public interface BookCommentMapper {
|
|||||||
c.map(id).toProperty("id")
|
c.map(id).toProperty("id")
|
||||||
.map(bookId).toProperty("bookId")
|
.map(bookId).toProperty("bookId")
|
||||||
.map(commentContent).toProperty("commentContent")
|
.map(commentContent).toProperty("commentContent")
|
||||||
|
.map(location).toProperty("location")
|
||||||
.map(replyCount).toProperty("replyCount")
|
.map(replyCount).toProperty("replyCount")
|
||||||
.map(auditStatus).toProperty("auditStatus")
|
.map(auditStatus).toProperty("auditStatus")
|
||||||
.map(createTime).toProperty("createTime")
|
.map(createTime).toProperty("createTime")
|
||||||
@ -118,6 +121,7 @@ public interface BookCommentMapper {
|
|||||||
c.map(id).toPropertyWhenPresent("id", record::getId)
|
c.map(id).toPropertyWhenPresent("id", record::getId)
|
||||||
.map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
|
.map(bookId).toPropertyWhenPresent("bookId", record::getBookId)
|
||||||
.map(commentContent).toPropertyWhenPresent("commentContent", record::getCommentContent)
|
.map(commentContent).toPropertyWhenPresent("commentContent", record::getCommentContent)
|
||||||
|
.map(location).toPropertyWhenPresent("location", record::getLocation)
|
||||||
.map(replyCount).toPropertyWhenPresent("replyCount", record::getReplyCount)
|
.map(replyCount).toPropertyWhenPresent("replyCount", record::getReplyCount)
|
||||||
.map(auditStatus).toPropertyWhenPresent("auditStatus", record::getAuditStatus)
|
.map(auditStatus).toPropertyWhenPresent("auditStatus", record::getAuditStatus)
|
||||||
.map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
|
.map(createTime).toPropertyWhenPresent("createTime", record::getCreateTime)
|
||||||
@ -157,6 +161,7 @@ public interface BookCommentMapper {
|
|||||||
return dsl.set(id).equalTo(record::getId)
|
return dsl.set(id).equalTo(record::getId)
|
||||||
.set(bookId).equalTo(record::getBookId)
|
.set(bookId).equalTo(record::getBookId)
|
||||||
.set(commentContent).equalTo(record::getCommentContent)
|
.set(commentContent).equalTo(record::getCommentContent)
|
||||||
|
.set(location).equalTo(record::getLocation)
|
||||||
.set(replyCount).equalTo(record::getReplyCount)
|
.set(replyCount).equalTo(record::getReplyCount)
|
||||||
.set(auditStatus).equalTo(record::getAuditStatus)
|
.set(auditStatus).equalTo(record::getAuditStatus)
|
||||||
.set(createTime).equalTo(record::getCreateTime)
|
.set(createTime).equalTo(record::getCreateTime)
|
||||||
@ -168,6 +173,7 @@ public interface BookCommentMapper {
|
|||||||
return dsl.set(id).equalToWhenPresent(record::getId)
|
return dsl.set(id).equalToWhenPresent(record::getId)
|
||||||
.set(bookId).equalToWhenPresent(record::getBookId)
|
.set(bookId).equalToWhenPresent(record::getBookId)
|
||||||
.set(commentContent).equalToWhenPresent(record::getCommentContent)
|
.set(commentContent).equalToWhenPresent(record::getCommentContent)
|
||||||
|
.set(location).equalToWhenPresent(record::getLocation)
|
||||||
.set(replyCount).equalToWhenPresent(record::getReplyCount)
|
.set(replyCount).equalToWhenPresent(record::getReplyCount)
|
||||||
.set(auditStatus).equalToWhenPresent(record::getAuditStatus)
|
.set(auditStatus).equalToWhenPresent(record::getAuditStatus)
|
||||||
.set(createTime).equalToWhenPresent(record::getCreateTime)
|
.set(createTime).equalToWhenPresent(record::getCreateTime)
|
||||||
@ -179,6 +185,7 @@ public interface BookCommentMapper {
|
|||||||
return update(c ->
|
return update(c ->
|
||||||
c.set(bookId).equalTo(record::getBookId)
|
c.set(bookId).equalTo(record::getBookId)
|
||||||
.set(commentContent).equalTo(record::getCommentContent)
|
.set(commentContent).equalTo(record::getCommentContent)
|
||||||
|
.set(location).equalTo(record::getLocation)
|
||||||
.set(replyCount).equalTo(record::getReplyCount)
|
.set(replyCount).equalTo(record::getReplyCount)
|
||||||
.set(auditStatus).equalTo(record::getAuditStatus)
|
.set(auditStatus).equalTo(record::getAuditStatus)
|
||||||
.set(createTime).equalTo(record::getCreateTime)
|
.set(createTime).equalTo(record::getCreateTime)
|
||||||
@ -192,6 +199,7 @@ public interface BookCommentMapper {
|
|||||||
return update(c ->
|
return update(c ->
|
||||||
c.set(bookId).equalToWhenPresent(record::getBookId)
|
c.set(bookId).equalToWhenPresent(record::getBookId)
|
||||||
.set(commentContent).equalToWhenPresent(record::getCommentContent)
|
.set(commentContent).equalToWhenPresent(record::getCommentContent)
|
||||||
|
.set(location).equalToWhenPresent(record::getLocation)
|
||||||
.set(replyCount).equalToWhenPresent(record::getReplyCount)
|
.set(replyCount).equalToWhenPresent(record::getReplyCount)
|
||||||
.set(auditStatus).equalToWhenPresent(record::getAuditStatus)
|
.set(auditStatus).equalToWhenPresent(record::getAuditStatus)
|
||||||
.set(createTime).equalToWhenPresent(record::getCreateTime)
|
.set(createTime).equalToWhenPresent(record::getCreateTime)
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>novel</artifactId>
|
<artifactId>novel</artifactId>
|
||||||
<groupId>com.java2nb</groupId>
|
<groupId>com.java2nb</groupId>
|
||||||
<version>5.1.3</version>
|
<version>5.1.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
@ -100,6 +100,22 @@ public class CrawlParser {
|
|||||||
.replaceAll("<p>\\s*</p>", "")
|
.replaceAll("<p>\\s*</p>", "")
|
||||||
.replaceAll("<p>", "")
|
.replaceAll("<p>", "")
|
||||||
.replaceAll("</p>", "<br/>");
|
.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);
|
book.setBookDesc(desc);
|
||||||
if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
|
if (StringUtils.isNotBlank(ruleBean.getStatusPatten())) {
|
||||||
@ -151,7 +167,7 @@ public class CrawlParser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean,
|
public boolean parseBookIndexAndContent(String sourceBookId, Book book, RuleBean ruleBean,
|
||||||
Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler) throws InterruptedException{
|
Map<Integer, BookIndex> existBookIndexMap, CrawlBookChapterHandler handler) throws InterruptedException {
|
||||||
|
|
||||||
Date currentDate = new Date();
|
Date currentDate = new Date();
|
||||||
|
|
||||||
@ -238,6 +254,8 @@ public class CrawlParser {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// 去除小说内容末尾的所有换行
|
||||||
|
content = removeTrailingBrTags(content);
|
||||||
//插入章节目录和章节内容
|
//插入章节目录和章节内容
|
||||||
BookIndex bookIndex = new BookIndex();
|
BookIndex bookIndex = new BookIndex();
|
||||||
bookIndex.setIndexName(indexName);
|
bookIndex.setIndexName(indexName);
|
||||||
@ -314,4 +332,12 @@ public class CrawlParser {
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除字符串末尾的所有 <br> 类似标签(允许各种空格)
|
||||||
|
*/
|
||||||
|
public static String removeTrailingBrTags(String str) {
|
||||||
|
return str.replaceAll("(?i)(?:\\s*<\\s*br\\s*/?\\s*>)++(?:\\s|\\u3000)*$", "");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -45,6 +45,7 @@ public class RuleBean {
|
|||||||
private String visitCountPatten;
|
private String visitCountPatten;
|
||||||
private String descStart;
|
private String descStart;
|
||||||
private String descEnd;
|
private String descEnd;
|
||||||
|
private String filterDesc;
|
||||||
private String upadateTimePatten;
|
private String upadateTimePatten;
|
||||||
private String upadateTimeFormatPatten;
|
private String upadateTimeFormatPatten;
|
||||||
private String bookIndexUrl;
|
private String bookIndexUrl;
|
||||||
|
@ -118,6 +118,9 @@
|
|||||||
示例:<b></p></b>
|
示例:<b></p></b>
|
||||||
<li><input type="text" id="descEnd" class="s_input icon_key" placeholder="小说简介结束截取字符串:">
|
<li><input type="text" id="descEnd" class="s_input icon_key" placeholder="小说简介结束截取字符串:">
|
||||||
</li>
|
</li>
|
||||||
|
示例:<b><span\s+class="allshow">([^/]+)</span></b>
|
||||||
|
<li><textarea id="filterDesc"
|
||||||
|
placeholder="过滤简介(多个内容换行)" rows="5" cols="52"></textarea></li>
|
||||||
示例:<b>更新:(\d+-\d+-\d+\s\d+:\d+:\d+)</a></b>
|
示例:<b>更新:(\d+-\d+-\d+\s\d+:\d+:\d+)</a></b>
|
||||||
<li><input type="text" id="upadateTimePatten" class="s_input icon_key"
|
<li><input type="text" id="upadateTimePatten" class="s_input icon_key"
|
||||||
placeholder="小说更新时间的正则表达式:"></li>
|
placeholder="小说更新时间的正则表达式:"></li>
|
||||||
@ -338,6 +341,9 @@
|
|||||||
|
|
||||||
crawlRule.descEnd = descEnd;
|
crawlRule.descEnd = descEnd;
|
||||||
|
|
||||||
|
var filterDesc = $("#filterDesc").val();
|
||||||
|
crawlRule.filterDesc = filterDesc;
|
||||||
|
|
||||||
var upadateTimePatten = $("#upadateTimePatten").val();
|
var upadateTimePatten = $("#upadateTimePatten").val();
|
||||||
|
|
||||||
if (upadateTimePatten.length > 0) {
|
if (upadateTimePatten.length > 0) {
|
||||||
|
@ -119,6 +119,9 @@
|
|||||||
示例:<b></p></b>
|
示例:<b></p></b>
|
||||||
<li><input type="text" id="descEnd" class="s_input icon_key" placeholder="小说简介结束截取字符串:">
|
<li><input type="text" id="descEnd" class="s_input icon_key" placeholder="小说简介结束截取字符串:">
|
||||||
</li>
|
</li>
|
||||||
|
示例:<b><span\s+class="allshow">([^/]+)</span></b>
|
||||||
|
<li><textarea id="filterDesc"
|
||||||
|
placeholder="过滤简介(多个内容换行)" rows="5" cols="52"></textarea></li>
|
||||||
示例:<b>更新:(\d+-\d+-\d+\s\d+:\d+:\d+)</a></b>
|
示例:<b>更新:(\d+-\d+-\d+\s\d+:\d+:\d+)</a></b>
|
||||||
<li><input type="text" id="upadateTimePatten" class="s_input icon_key"
|
<li><input type="text" id="upadateTimePatten" class="s_input icon_key"
|
||||||
placeholder="小说更新时间的正则表达式:"></li>
|
placeholder="小说更新时间的正则表达式:"></li>
|
||||||
@ -266,6 +269,7 @@
|
|||||||
$("#visitCountPatten").val(crawlRule.visitCountPatten);
|
$("#visitCountPatten").val(crawlRule.visitCountPatten);
|
||||||
$("#descStart").val(crawlRule.descStart);
|
$("#descStart").val(crawlRule.descStart);
|
||||||
$("#descEnd").val(crawlRule.descEnd);
|
$("#descEnd").val(crawlRule.descEnd);
|
||||||
|
$("#filterDesc").val(crawlRule.filterDesc);
|
||||||
$("#upadateTimePatten").val(crawlRule.upadateTimePatten);
|
$("#upadateTimePatten").val(crawlRule.upadateTimePatten);
|
||||||
$("#upadateTimeFormatPatten").val(crawlRule.upadateTimeFormatPatten);
|
$("#upadateTimeFormatPatten").val(crawlRule.upadateTimeFormatPatten);
|
||||||
$("#bookIndexUrl").val(crawlRule.bookIndexUrl);
|
$("#bookIndexUrl").val(crawlRule.bookIndexUrl);
|
||||||
@ -424,6 +428,9 @@
|
|||||||
|
|
||||||
crawlRule.descEnd = descEnd;
|
crawlRule.descEnd = descEnd;
|
||||||
|
|
||||||
|
var filterDesc = $("#filterDesc").val();
|
||||||
|
crawlRule.filterDesc = filterDesc;
|
||||||
|
|
||||||
var upadateTimePatten = $("#upadateTimePatten").val();
|
var upadateTimePatten = $("#upadateTimePatten").val();
|
||||||
|
|
||||||
if (upadateTimePatten.length > 0) {
|
if (upadateTimePatten.length > 0) {
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>novel</artifactId>
|
<artifactId>novel</artifactId>
|
||||||
<groupId>com.java2nb</groupId>
|
<groupId>com.java2nb</groupId>
|
||||||
<version>5.1.3</version>
|
<version>5.1.5</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@ -61,6 +61,12 @@
|
|||||||
<groupId>org.springframework.ai</groupId>
|
<groupId>org.springframework.ai</groupId>
|
||||||
<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
|
<artifactId>spring-ai-openai-spring-boot-starter</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.lionsoul</groupId>
|
||||||
|
<artifactId>ip2region</artifactId>
|
||||||
|
<version>2.7.0</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -2,12 +2,14 @@ package com.java2nb.novel.controller;
|
|||||||
|
|
||||||
import com.java2nb.novel.core.bean.UserDetails;
|
import com.java2nb.novel.core.bean.UserDetails;
|
||||||
import com.java2nb.novel.core.enums.ResponseStatus;
|
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.Book;
|
||||||
import com.java2nb.novel.entity.BookCategory;
|
import com.java2nb.novel.entity.BookCategory;
|
||||||
import com.java2nb.novel.entity.BookComment;
|
import com.java2nb.novel.entity.BookComment;
|
||||||
import com.java2nb.novel.entity.BookIndex;
|
import com.java2nb.novel.entity.BookIndex;
|
||||||
import com.java2nb.novel.service.BookContentService;
|
import com.java2nb.novel.service.BookContentService;
|
||||||
import com.java2nb.novel.service.BookService;
|
import com.java2nb.novel.service.BookService;
|
||||||
|
import com.java2nb.novel.service.IpLocationService;
|
||||||
import com.java2nb.novel.vo.BookCommentVO;
|
import com.java2nb.novel.vo.BookCommentVO;
|
||||||
import com.java2nb.novel.vo.BookSettingVO;
|
import com.java2nb.novel.vo.BookSettingVO;
|
||||||
import com.java2nb.novel.vo.BookSpVO;
|
import com.java2nb.novel.vo.BookSpVO;
|
||||||
@ -37,6 +39,8 @@ public class BookController extends BaseController {
|
|||||||
|
|
||||||
private final Map<String, BookContentService> bookContentServiceMap;
|
private final Map<String, BookContentService> bookContentServiceMap;
|
||||||
|
|
||||||
|
private final IpLocationService ipLocationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询首页小说设置列表数据
|
* 查询首页小说设置列表数据
|
||||||
*/
|
*/
|
||||||
@ -158,6 +162,7 @@ public class BookController extends BaseController {
|
|||||||
if (userDetails == null) {
|
if (userDetails == null) {
|
||||||
return RestResult.fail(ResponseStatus.NO_LOGIN);
|
return RestResult.fail(ResponseStatus.NO_LOGIN);
|
||||||
}
|
}
|
||||||
|
comment.setLocation(ipLocationService.getLocation(IpUtil.getRealIp(request)));
|
||||||
bookService.addBookComment(userDetails.getId(), comment);
|
bookService.addBookComment(userDetails.getId(), comment);
|
||||||
return RestResult.ok();
|
return RestResult.ok();
|
||||||
}
|
}
|
||||||
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -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);
|
||||||
|
|
||||||
|
}
|
@ -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 "未知地区";
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
BIN
novel-front/src/main/resources/ip2region.xdb
Normal file
BIN
novel-front/src/main/resources/ip2region.xdb
Normal file
Binary file not shown.
@ -4,7 +4,7 @@
|
|||||||
<mapper namespace="com.java2nb.novel.mapper.FrontBookCommentMapper">
|
<mapper namespace="com.java2nb.novel.mapper.FrontBookCommentMapper">
|
||||||
|
|
||||||
<select id="listCommentByPage" resultType="com.java2nb.novel.vo.BookCommentVO">
|
<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
|
from book_comment t1 inner join user t2 on t1.create_user_id = t2.id
|
||||||
<trim>
|
<trim>
|
||||||
<if test="bookId != null">
|
<if test="bookId != null">
|
||||||
|
@ -135,7 +135,7 @@
|
|||||||
"<div class=\"user_heads fl\" vals=\"389\">" +
|
"<div class=\"user_heads fl\" vals=\"389\">" +
|
||||||
"<img src=\""+(comment.createUserPhoto ? comment.createUserPhoto : '/images/man.png')+"\" class=\"user_head\" alt=\"\">" +
|
"<img src=\""+(comment.createUserPhoto ? comment.createUserPhoto : '/images/man.png')+"\" class=\"user_head\" alt=\"\">" +
|
||||||
"<span class=\"user_level1\" style=\"display: none;\">见习</span></div>" +
|
"<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+
|
comment.commentContent+
|
||||||
"</li><li class=\"other cf\">" +
|
"</li><li class=\"other cf\">" +
|
||||||
"<span class=\"time fl\">"+comment.createTime+"</span>" +
|
"<span class=\"time fl\">"+comment.createTime+"</span>" +
|
||||||
|
@ -95,7 +95,7 @@
|
|||||||
<span class="block">暂无评论</span>
|
<span class="block">暂无评论</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="commentBar" id="commentPanel" th:style="${bookCommentPageBean.total == 0}? 'display:none'">
|
<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>
|
</div>
|
||||||
|
|
||||||
@ -319,7 +319,7 @@
|
|||||||
"<div class=\"user_heads fl\" vals=\"389\">" +
|
"<div class=\"user_heads fl\" vals=\"389\">" +
|
||||||
"<img src=\""+(comment.createUserPhoto ? comment.createUserPhoto : '/images/man.png')+"\" class=\"user_head\" alt=\"\">" +
|
"<img src=\""+(comment.createUserPhoto ? comment.createUserPhoto : '/images/man.png')+"\" class=\"user_head\" alt=\"\">" +
|
||||||
"<span class=\"user_level1\" style=\"display: none;\">见习</span></div>" +
|
"<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+
|
comment.commentContent+
|
||||||
"</li><li class=\"other cf\">" +
|
"</li><li class=\"other cf\">" +
|
||||||
"<span class=\"time fl\">"+comment.createTime+"</span>" +
|
"<span class=\"time fl\">"+comment.createTime+"</span>" +
|
||||||
|
2
pom.xml
2
pom.xml
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>com.java2nb</groupId>
|
<groupId>com.java2nb</groupId>
|
||||||
<artifactId>novel</artifactId>
|
<artifactId>novel</artifactId>
|
||||||
<version>5.1.3</version>
|
<version>5.1.5</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>novel-common</module>
|
<module>novel-common</module>
|
||||||
<module>novel-front</module>
|
<module>novel-front</module>
|
||||||
|
Reference in New Issue
Block a user