From f1f06a7421142344fe3548c2adb35ecdc83b3009 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, 3 Aug 2022 15:43:46 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=20ruoyi-common-elastic?=
 =?UTF-8?q?search=20=E6=A8=A1=E5=9D=97=20=E9=9B=86=E6=88=90=20easy-es=20?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=90=9C=E7=B4=A2=E5=BC=95=E6=93=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-common/pom.xml                          |  1 +
 ruoyi-common/ruoyi-common-bom/pom.xml         |  6 +++++
 .../ruoyi-common-elasticsearch/pom.xml        | 25 +++++++++++++++++++
 .../config/EasyEsConfiguration.java           | 15 +++++++++++
 ...ot.autoconfigure.AutoConfiguration.imports |  1 +
 5 files changed, 48 insertions(+)
 create mode 100644 ruoyi-common/ruoyi-common-elasticsearch/pom.xml
 create mode 100644 ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java
 create mode 100644 ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 13f4039e..6aeb2abd 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -30,6 +30,7 @@
         <module>ruoyi-common-mail</module>
         <module>ruoyi-common-sms</module>
         <module>ruoyi-common-logstash</module>
+        <module>ruoyi-common-elasticsearch</module>
     </modules>
 
     <artifactId>ruoyi-common</artifactId>
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
index 57654bbe..0d580796 100644
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -138,6 +138,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.ruoyi</groupId>
+                <artifactId>ruoyi-common-elasticsearch</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
new file mode 100644
index 00000000..2593679c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.ruoyi</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>1.1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-elasticsearch</artifactId>
+
+    <description>
+        ruoyi-common-elasticsearch ES搜索引擎服务
+    </description>
+
+	<dependencies>
+        <dependency>
+            <groupId>cn.easy-es</groupId>
+            <artifactId>easy-es-boot-starter</artifactId>
+            <version>0.9.70</version>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java
new file mode 100644
index 00000000..cc67e936
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-elasticsearch/src/main/java/com/ruoyi/common/elasticsearch/config/EasyEsConfiguration.java
@@ -0,0 +1,15 @@
+package com.ruoyi.common.elasticsearch.config;
+
+import cn.easyes.starter.register.EsMapperScan;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+
+/**
+ * easy-es 配置
+ *
+ * @author Lion Li
+ */
+@AutoConfiguration
+@EsMapperScan("com.ruoyi.**.esmapper")
+public class EasyEsConfiguration {
+
+}
diff --git a/ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 00000000..e2a0d5e6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-elasticsearch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+com.ruoyi.common.elasticsearch.config.EasyEsConfiguration