From e09aad2415841bb626db75406b7f9a8d7b6b79d7 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <1179705413@qq.com>
Date: Sat, 1 Jun 2024 21:12:55 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7spring-boot3?=
 =?UTF-8?q?=E8=87=B33.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 19 ++++++-------------
 .../xxyopen/novel/core/config/EsConfig.java   |  9 ---------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index 99b1b9c..e474fe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.3.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>io.github.xxyopen</groupId>
@@ -16,16 +16,15 @@
     <description>Spring Boot 3 + Vue 3 构建的前后端分离小说系统</description>
     <properties>
         <java.version>17</java.version>
-        <mybatis-plus.version>3.5.3</mybatis-plus.version>
+        <mybatis-plus.version>3.5.6</mybatis-plus.version>
         <mybatis-plus-generator.version>3.5.1</mybatis-plus-generator.version>
         <jjwt.version>0.11.5</jjwt.version>
-        <elasticsearch.version>8.2.0</elasticsearch.version>
         <xxl-job.version>2.3.1</xxl-job.version>
         <sentinel.version>1.8.4</sentinel.version>
         <shardingsphere-jdbc.version>5.2.1</shardingsphere-jdbc.version>
         <redisson.version>3.19.1</redisson.version>
         <spring-boot-admin.version>3.0.0-M1</spring-boot-admin.version>
-        <springdoc-openapi.version>2.0.0</springdoc-openapi.version>
+        <springdoc-openapi.version>2.5.0</springdoc-openapi.version>
     </properties>
 
     <dependencies>
@@ -50,7 +49,7 @@
         <!-- mybatis-plus -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
             <version>${mybatis-plus.version}</version>
         </dependency>
 
@@ -107,15 +106,9 @@
             <artifactId>hibernate-validator</artifactId>
         </dependency>
 
-        <!-- elasticsearch 相关 -->
         <dependency>
-            <groupId>co.elastic.clients</groupId>
-            <artifactId>elasticsearch-java</artifactId>
-            <version>${elasticsearch.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
         </dependency>
 
         <!-- MQ 相关 -->
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 a35fbb2..38620b2 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,6 +1,5 @@
 package io.github.xxyopen.novel.core.config;
 
-import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
 import org.elasticsearch.client.RestClient;
@@ -29,14 +28,6 @@ import java.security.cert.X509Certificate;
 @Slf4j
 public class EsConfig {
 
-    /**
-     * 解决 ElasticsearchClientConfigurations 修改默认 ObjectMapper 配置的问题
-     */
-    @Bean
-    JacksonJsonpMapper jacksonJsonpMapper() {
-        return new JacksonJsonpMapper();
-    }
-
     /**
      * fix `sun.security.validator.ValidatorException: PKIX path building failed: sun.security.provider.certpath.SunCertPathBuilderException:
      * unable to find valid certification path to requested target`