From 5eec6936846821e13cd23256f27adcdf1c433db3 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 16:42:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=85=B3=E9=97=AD=20elasticsearch=20=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/elasticsearch/config/EasyEsConfiguration.java  | 2 ++
 .../main/java/com/ruoyi/demo/controller/EsCrudController.java   | 2 ++
 2 files changed, 4 insertions(+)

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
index cc67e936..7e151e74 100644
--- 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
@@ -2,6 +2,7 @@ package com.ruoyi.common.elasticsearch.config;
 
 import cn.easyes.starter.register.EsMapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 /**
  * easy-es 配置
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration;
  * @author Lion Li
  */
 @AutoConfiguration
+@ConditionalOnProperty(value = "easy-es.enable", havingValue = "true")
 @EsMapperScan("com.ruoyi.**.esmapper")
 public class EasyEsConfiguration {
 
diff --git a/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java b/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java
index e53481b2..2e2ebae0 100644
--- a/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java
+++ b/ruoyi-example/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/EsCrudController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.demo.domain.Document;
 import com.ruoyi.demo.esmapper.DocumentMapper;
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -14,6 +15,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@ConditionalOnProperty(value = "easy-es.enable", havingValue = "true")
 @RestController
 @RequiredArgsConstructor
 public class EsCrudController {