diff --git a/pom.xml b/pom.xml index 6a006f9..9d25a1b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,8 @@ org.springframework.boot spring-boot-starter-parent - 3.0.0-M3 + 3.0.0-M4 + io.github.xxyopen novel @@ -16,6 +17,7 @@ 17 3.5.1 + 6.0.0-SNAPSHOT 0.11.5 8.2.0 2.3.1 @@ -233,15 +235,20 @@ - spring-snapshots - https://repo.spring.io/snapshot + spring-milestones + Spring Milestones + https://repo.spring.io/milestone - true + false - spring-milestones - https://repo.spring.io/milestone + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + sonatype-nexus-snapshots @@ -278,12 +285,20 @@ - spring-snapshots - https://repo.spring.io/snapshot + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + - spring-milestones - https://repo.spring.io/milestone + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + false + diff --git a/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java b/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java index 0bb2fb9..58eafa9 100644 --- a/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java +++ b/src/main/java/io/github/xxyopen/novel/core/config/EsConfig.java @@ -1,12 +1,6 @@ package io.github.xxyopen.novel.core.config; -import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.json.jackson.JacksonJsonpMapper; -import co.elastic.clients.transport.ElasticsearchTransport; -import co.elastic.clients.transport.rest_client.RestClientTransport; -import lombok.RequiredArgsConstructor; -import org.elasticsearch.client.RestClient; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -17,19 +11,14 @@ import org.springframework.context.annotation.Configuration; * @date 2022/5/23 */ @Configuration -@ConditionalOnProperty(prefix = "spring.elasticsearch", name = "enabled", havingValue = "true") -@RequiredArgsConstructor public class EsConfig { + /** + * 解决 ElasticsearchClientConfigurations 修改默认 ObjectMapper 配置的问题 + */ @Bean - public ElasticsearchClient elasticsearchClient(RestClient restClient) { - - // Create the transport with a Jackson mapper - ElasticsearchTransport transport = new RestClientTransport( - restClient, new JacksonJsonpMapper()); - - // And create the API client - return new ElasticsearchClient(transport); + JacksonJsonpMapper jacksonJsonpMapper() { + return new JacksonJsonpMapper(); } }