diff --git a/hongshu-common/pom.xml b/hongshu-common/pom.xml index ed49100..5e48d80 100644 --- a/hongshu-common/pom.xml +++ b/hongshu-common/pom.xml @@ -134,6 +134,18 @@ co.elastic.clients elasticsearch-java + + org.elasticsearch.client + elasticsearch-rest-client + + + jakarta.json + jakarta.json-api + + + org.eclipse.parsson + parsson + com.google.code.gson diff --git a/hongshu-server/src/main/resources/application-druid.yml b/hongshu-server/src/main/resources/application-druid.yml index 5e94316..61d87f6 100644 --- a/hongshu-server/src/main/resources/application-druid.yml +++ b/hongshu-server/src/main/resources/application-druid.yml @@ -8,7 +8,7 @@ spring: master: url: jdbc:mysql://localhost:3306/hongshu_springboot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8 username: root - password: Myj950501 + password: 123456 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/hongshu-server/src/main/resources/application.yml b/hongshu-server/src/main/resources/application.yml index 2afc3ec..e845fba 100644 --- a/hongshu-server/src/main/resources/application.yml +++ b/hongshu-server/src/main/resources/application.yml @@ -75,7 +75,7 @@ spring: # 数据库索引 database: 0 # 密码 - password: Myj950501 + password: # 连接超时时间 timeout: 10s lettuce: diff --git a/hongshu-web/src/main/java/com/hongshu/web/service/impl/WebEsNoteServiceImpl.java b/hongshu-web/src/main/java/com/hongshu/web/service/impl/WebEsNoteServiceImpl.java index e69a18c..bc7bf48 100644 --- a/hongshu-web/src/main/java/com/hongshu/web/service/impl/WebEsNoteServiceImpl.java +++ b/hongshu-web/src/main/java/com/hongshu/web/service/impl/WebEsNoteServiceImpl.java @@ -300,6 +300,10 @@ public class WebEsNoteServiceImpl extends ServiceImpl im @Override public void addNoteBulkData() { List noteList = noteMapper.selectList(new QueryWrapper().eq("audit_status", 1)); + if (CollectionUtil.isEmpty(noteList)) { + log.info("数据库中没有需要同步的笔记数据,跳过批量插入。"); + return; + } List noteSearchVOList = DozerUtil.convertor(noteList, NoteSearchVO.class); for (NoteSearchVO noteSearchVo : noteSearchVOList) { WebUser user = userMapper.selectOne(new QueryWrapper().like("id", noteSearchVo.getUid())); diff --git a/pom.xml b/pom.xml index a3db80e..efa68e0 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 0.9.1 1.18.24 5.7.22 - 8.1.0 + 8.13.4 20.0 2.9.0 3.5.2 @@ -156,8 +156,24 @@ co.elastic.clients elasticsearch-java - ${elasticsearch-version} + ${elasticsearch.version} + + org.elasticsearch.client + elasticsearch-rest-client + ${elasticsearch.version} + + + jakarta.json + jakarta.json-api + 2.0.1 + + + org.eclipse.parsson + parsson + 1.0.5 + + com.google.guava