From 5e29d07cf24c2a80ebe54199d0cd47f7d3ee20fe Mon Sep 17 00:00:00 2001
From: zhangchen <zhangchen@wealthgrow.cn>
Date: Mon, 19 Jul 2021 18:50:42 +0800
Subject: [PATCH] es config

---
 .../java/com/tanpu/community/CommunityApplication.java    | 2 +-
 .../main/java/com/tanpu/community/config/ESConfig.java    | 8 ++++++--
 community-service/src/main/resources/application-dev.yml  | 6 ++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/community-service/src/main/java/com/tanpu/community/CommunityApplication.java b/community-service/src/main/java/com/tanpu/community/CommunityApplication.java
index 56d469a..3c7a47c 100644
--- a/community-service/src/main/java/com/tanpu/community/CommunityApplication.java
+++ b/community-service/src/main/java/com/tanpu/community/CommunityApplication.java
@@ -1,5 +1,6 @@
 package com.tanpu.community;
 
+import com.tanpu.community.config.ESConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -13,7 +14,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableCaching
 @EnableScheduling
 @EnableFeignClients
-@EnableConfigurationProperties
 public class CommunityApplication {
 
     public static void main(String[] args) {
diff --git a/community-service/src/main/java/com/tanpu/community/config/ESConfig.java b/community-service/src/main/java/com/tanpu/community/config/ESConfig.java
index 7f88ec7..34fe273 100644
--- a/community-service/src/main/java/com/tanpu/community/config/ESConfig.java
+++ b/community-service/src/main/java/com/tanpu/community/config/ESConfig.java
@@ -10,18 +10,22 @@ import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
-@Component
-@ConfigurationProperties(prefix = "es")
+@Configuration
 public class ESConfig {
 
+    @Value("${es.userName}")
     private String userName;
+    @Value("${es.userPasswd}")
     private String userPasswd;
+    @Value("${es.host}")
     private String host;
+    @Value("${es.port}")
     private Integer port;
 
     @Bean
diff --git a/community-service/src/main/resources/application-dev.yml b/community-service/src/main/resources/application-dev.yml
index 19796eb..7f7ffe4 100644
--- a/community-service/src/main/resources/application-dev.yml
+++ b/community-service/src/main/resources/application-dev.yml
@@ -108,3 +108,9 @@ aliyun:
     accessId: LTAIAKEzVydP0Q9P
     accessSK: 59V9ke9txaIFzWxHFKTb1eoOOpmKpJ
     bucketName: tamp-sit
+
+es:
+  host: 42.194.224.208
+  port: 9200
+  userName: 1
+  userPasswd: 2
\ No newline at end of file
-- 
2.18.1