From 32ba801be3260602f2e35283d1ebd229c5234a57 Mon Sep 17 00:00:00 2001
From: Mahone <22247537@qq.com>
Date: Mon, 30 Oct 2023 10:01:19 +0800
Subject: [PATCH] =?UTF-8?q?ES=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../KM/common/config/ElasticsearchConfig.java | 22 ++++++++++++++-----
 .../src/main/resources/application-prod.yml   |  5 ++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java
index d48d2a0..c95b47c 100644
--- a/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java
+++ b/jeecg-boot/jeecg-boot-module-KM/src/main/java/org/jeecg/modules/KM/common/config/ElasticsearchConfig.java
@@ -39,6 +39,17 @@ public class ElasticsearchConfig {
     private String masterHost;
     private Integer masterPort;
 
+    public boolean isMasterAuth() {
+        return masterAuth;
+    }
+
+    public void setMasterAuth(boolean masterAuth) {
+        this.masterAuth = masterAuth;
+    }
+
+    private boolean masterAuth;
+
+
     public String getMasterUserName() {
         return masterUserName;
     }
@@ -63,11 +74,12 @@ public class ElasticsearchConfig {
 
         HttpHost host=new HttpHost(masterHost, masterPort, HttpHost.DEFAULT_SCHEME_NAME);
         RestClientBuilder builder=RestClient.builder(host);
-//        CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
-//        credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(masterUserName, masterUserPwd));
-//        builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider));
-        RestHighLevelClient restClient = new RestHighLevelClient( builder);
+        if(masterAuth) {
+            CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+            credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(masterUserName, masterUserPwd));
+            builder.setHttpClientConfigCallback(f -> f.setDefaultCredentialsProvider(credentialsProvider));
+        }
 
-        return restClient;
+        return new RestHighLevelClient( builder);
     }
 }
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
index 950292d..6894a74 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
@@ -30,8 +30,11 @@ base:
 
 ##ElasticSearch服务配置 for highLevelRestClient
 esclient:
-  master-host: kykms-ES
+  master-host: 127.0.0.1
   master-port: 9200
+  master-auth: false
+  master-user-name: elastic
+  master-user-pwd: xxxxxxxxxxxxxxxx
 
 spring:
   servlet: