elasticsearch升级到7.x，集成RestHighLevelClient客户端

novel-book/book-service/pom.xml

@@ -35,7 +35,6 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>${redisson.version}</version>
         </dependency>
 
         <!-- 分库分表-->
@@ -44,13 +43,11 @@
         <dependency>
             <groupId>io.shardingsphere</groupId>
             <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-            <version>${sharding.jdbc.version}</version>
         </dependency>
 
         <dependency>
             <groupId>io.shardingsphere</groupId>
             <artifactId>sharding-jdbc-spring-namespace</artifactId>
-            <version>${sharding.jdbc.version}</version>
         </dependency>
 
 

novel-search/pom.xml

@@ -27,10 +27,13 @@
             <artifactId>spring-cloud-netflix-hystrix</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.searchbox</groupId>
             <artifactId>jest</artifactId>
-            <version>${jest.version}</version>
         </dependency>
 
         <dependency>
@@ -42,7 +45,6 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>${redisson.version}</version>
         </dependency>
 
 

novel-search/src/main/java/com/java2nb/novel/SearchApplication.java

@@ -2,6 +2,7 @@ package com.java2nb.novel;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -14,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableFeignClients
 @EnableScheduling
+@ServletComponentScan
 public class SearchApplication {
 
     public static void main(String[] args) {

novel-search/src/main/java/com/java2nb/novel/search/config/EsConfig.java

@@ -0,0 +1,40 @@
+package com.java2nb.novel.search.config;
+
+
+import org.apache.http.HttpHost;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * elasticsearch搜索引擎配置
+ * @author xiongxiaoyang
+ */
+@Configuration
+public class EsConfig {
+
+    @Value("${spring.elasticsearch.jest.uris}")
+    private String esUris;
+
+    @Bean
+    public RestHighLevelClient esClient(){
+
+
+        String[] uris = esUris.split(",");
+        HttpHost[] hosts = new HttpHost[uris.length];
+        for(int i = 0 ; i < uris.length ; i++){
+            String uri = uris[i];
+            String scheme = uri.substring(0,uri.indexOf(":")).trim();
+            String hostname = uri.substring(uri.indexOf("://")+3,uri.lastIndexOf(":")).trim();
+            Integer port = Integer.parseInt(uri.substring(uri.lastIndexOf(":")+1).trim());
+            hosts[i] = new HttpHost(hostname,port,scheme);
+        }
+
+        return new RestHighLevelClient(
+                RestClient.builder(hosts));
+
+    }
+}

novel-search/src/main/java/com/java2nb/novel/search/service/impl/SearchServiceImpl.java

@@ -17,6 +17,11 @@ import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -42,12 +47,12 @@ import java.util.Map;
 @Slf4j
 public class SearchServiceImpl implements SearchService {
 
-    private final String INDEX = "novel";
-
-    private final String TYPE = "book";
-
     private final JestClient jestClient;
 
+    private final RestHighLevelClient restHighLevelClient;
+
+    private final String INDEX = "novel";
+
 
     @SneakyThrows
     @Override
@@ -57,9 +62,13 @@ public class SearchServiceImpl implements SearchService {
         EsBookVO esBookVO = new EsBookVO();
         BeanUtils.copyProperties(book, esBookVO, "lastIndexUpdateTime");
         esBookVO.setLastIndexUpdateTime(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(book.getLastIndexUpdateTime()));
-        Index action = new Index.Builder(esBookVO).index(INDEX).type(TYPE).id(book.getId().toString()).build();
 
-        jestClient.execute(action);
+        IndexRequest request = new IndexRequest(INDEX);
+        request.id(book.getId()+"");
+        request.source(new ObjectMapper().writeValueAsString(esBookVO), XContentType.JSON);
+        IndexResponse index = restHighLevelClient.index(request, RequestOptions.DEFAULT);
+
+        log.debug(index.getResult().toString());
 
     }
 
@@ -115,7 +124,7 @@ public class SearchServiceImpl implements SearchService {
         searchSourceBuilder.query(boolQueryBuilder);
 
 
-        Count count = new Count.Builder().addIndex(INDEX).addType(TYPE)
+        Count count = new Count.Builder().addIndex(INDEX)
                 .query(searchSourceBuilder.toString()).build();
         CountResult results = jestClient.execute(count);
         Double total = results.getCount();
@@ -143,7 +152,7 @@ public class SearchServiceImpl implements SearchService {
         searchSourceBuilder.size(pageSize);
 
         // 构建Search对象
-        Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(INDEX).addType(TYPE).build();
+        Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(INDEX).build();
         log.debug(search.toString());
         SearchResult result;
         result = jestClient.execute(search);

pom.xml

@@ -52,7 +52,7 @@
         <orderbyhelper.version>1.0.2</orderbyhelper.version>
         <commons-lang3.version>3.4</commons-lang3.version>
         <jjwt.version>0.10.6</jjwt.version>
-        <elasticsearch.version>6.2.2</elasticsearch.version>
+        <elasticsearch.version>7.9.3</elasticsearch.version>
         <jest.version>6.3.1</jest.version>
         <redis.version>1.4.1.RELEASE</redis.version>
         <redisson.version>3.12.5</redisson.version>
@@ -191,6 +191,11 @@
                 <artifactId>spring-boot-starter-redis</artifactId>
                 <version>${redis.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.redisson</groupId>
+                <artifactId>redisson-spring-boot-starter</artifactId>
+                <version>${redisson.version}</version>
+            </dependency>
 
             <!--mysql驱动-->
             <dependency>
@@ -274,6 +279,18 @@
                 <optional>true</optional>
             </dependency>
 
+            <!--elasticsearch -->
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.searchbox</groupId>
+                <artifactId>jest</artifactId>
+                <version>${jest.version}</version>
+            </dependency>
+
             <!--集成logstash-->
             <dependency>
                 <groupId>net.logstash.logback</groupId>