diff --git a/pom.xml b/pom.xml
index 1edacc2c8..89ccd0537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
1.37.0
1.18.30
7.4
- 1.1.1
+ 2.0.0-beta4
7.14.0
8.16.0
1.76
@@ -293,7 +293,7 @@
- cn.easy-es
+ org.dromara.easy-es
easy-es-boot-starter
${easy-es.version}
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
index 1e542ff2f..401320dc7 100644
--- a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
+++ b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
@@ -17,7 +17,7 @@
- cn.easy-es
+ org.dromara.easy-es
easy-es-boot-starter
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 837ca93e2..3d6354a34 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 a48952c5f..d3a154801 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 f412bc18b..c925b6263 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 {
}
diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml
index a7238b2fd..d35ec4132 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