ES登录问题修复

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);
     }
 }

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: