From 661095e431e36157d084cb88c5ff5bc01d6d8047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 22 Nov 2023 12:29:30 +0800
Subject: [PATCH] update easy-es 1.1.1 => 2.0.0-beta4

---
 pom.xml                                                       | 4 ++--
 ruoyi-common/ruoyi-common-elasticsearch/pom.xml               | 2 +-
 .../common/elasticsearch/config/EasyEsConfiguration.java      | 2 +-
 .../java/org/dromara/demo/controller/EsCrudController.java    | 4 ++--
 .../main/java/org/dromara/demo/esmapper/DocumentMapper.java   | 2 +-
 ruoyi-example/ruoyi-demo/src/main/resources/application.yml   | 4 ----
 6 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1edacc2c..89ccd053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
         <satoken.version>1.37.0</satoken.version>
         <lombok.version>1.18.30</lombok.version>
         <logstash.version>7.4</logstash.version>
-        <easy-es.version>1.1.1</easy-es.version>
+        <easy-es.version>2.0.0-beta4</easy-es.version>
         <elasticsearch.version>7.14.0</elasticsearch.version>
         <skywalking-toolkit.version>8.16.0</skywalking-toolkit.version>
         <bouncycastle.version>1.76</bouncycastle.version>
@@ -293,7 +293,7 @@
             </dependency>
 
             <dependency>
-                <groupId>cn.easy-es</groupId>
+                <groupId>org.dromara.easy-es</groupId>
                 <artifactId>easy-es-boot-starter</artifactId>
                 <version>${easy-es.version}</version>
             </dependency>
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
index 1e542ff2..401320dc 100644
--- a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
+++ b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
@@ -17,7 +17,7 @@
 
 	<dependencies>
         <dependency>
-            <groupId>cn.easy-es</groupId>
+            <groupId>org.dromara.easy-es</groupId>
             <artifactId>easy-es-boot-starter</artifactId>
         </dependency>
     </dependencies>
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java
index 837ca93e..3d6354a3 100644
--- a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java
+++ b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/org/dromara/common/elasticsearch/config/EasyEsConfiguration.java
@@ -1,6 +1,6 @@
 package org.dromara.common.elasticsearch.config;
 
-import cn.easyes.starter.register.EsMapperScan;
+import org.dromara.easyes.starter.register.EsMapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java
index a48952c5..d3a15480 100644
--- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java
+++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/EsCrudController.java
@@ -1,10 +1,10 @@
 package org.dromara.demo.controller;
 
-import cn.easyes.core.conditions.LambdaEsQueryWrapper;
+import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.demo.domain.Document;
 import org.dromara.demo.esmapper.DocumentMapper;
-import lombok.RequiredArgsConstructor;
+import org.dromara.easyes.core.conditions.select.LambdaEsQueryWrapper;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java
index f412bc18..c925b626 100644
--- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java
+++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/esmapper/DocumentMapper.java
@@ -1,7 +1,7 @@
 package org.dromara.demo.esmapper;
 
-import cn.easyes.core.conditions.interfaces.BaseEsMapper;
 import org.dromara.demo.domain.Document;
+import org.dromara.easyes.core.core.BaseEsMapper;
 
 public interface DocumentMapper extends BaseEsMapper<Document> {
 }
diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
index a7238b2f..d35ec413 100644
--- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
+++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
@@ -90,8 +90,6 @@ easy-es:
   connectTimeout: 5000
   # 通信超时时间 单位:ms
   socketTimeout: 5000
-  # 请求超时时间 单位:ms
-  requestTimeout: 5000
   # 连接请求超时时间 单位:ms
   connectionRequestTimeout: 5000
   # 最大连接数 单位:个
@@ -114,5 +112,3 @@ easy-es:
       enable-track-total-hits: true
       # 数据刷新策略,默认为不刷新
       refresh-policy: immediate
-      # 是否全局开启must查询类型转换为filter查询类型 默认为false不转换
-      enable-must2-filter: false