增加ES用户认证功能

pom.xml

@@ -106,6 +106,7 @@
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <!-- 配置文件转移到conf目录 -->
            <!-- 配置文件转移到conf目录 -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
@@ -120,7 +121,7 @@
                            <encoding>UTF-8</encoding>
                            <!-- 表示把配置文件拷到和jar包同一个路径下 -->
                            <outputDirectory>
                                ${project.build.directory}/config
                                ${project.build.directory}/conf
                            </outputDirectory>
                            <resources>
                                <resource>

src/main/assembly/package.xml

@@ -30,8 +30,8 @@
    <!-- 把项目的配置文件，打包进zip文件的config目录 -->
    <fileSet>
<!--      <directory>/src/main/resources/environment/${env}</directory>-->
      <directory>/src/main/resources</directory>
      <directory>/src/main/resources/environment/${env}</directory>
<!--      <directory>/src/main/resources</directory>-->
      <outputDirectory>/config</outputDirectory>
      <includes>
        <include>**/*.properties</include>

src/main/java/com/ai/bss/es/esmanage/service/impl/EsServiceImpl.java

@@ -12,13 +12,16 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import lombok.extern.slf4j.Slf4j;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.TermsQueryBuilder;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@Slf4j
@@ -28,15 +31,22 @@ public class EsServiceImpl implements EsService {
    @Value("${es.server:10.19.29.37:10020}")
    String esServer ;
    @Value("${es.server.username}")
    String userName ;
    @Value("${es.server.password}")
    String password ;
//    @Autowired
//    ElasticEntityRepository elasticEntityRepository;
    ElasticEntityRepository elasticEntityRepository = null;
    private ElasticEntityRepository getElasticEntityRepository(){
        if(elasticEntityRepository==null){
//            elasticEntityRepository = new ElasticEntityRepositoryImpl(esServer,userName,password);
            elasticEntityRepository = new ElasticEntityRepositoryImpl();
            log.debug("esServer:"+esServer);
            elasticEntityRepository.initServer(esServer);
            elasticEntityRepository.initServer(esServer,userName,password);
        }
        return elasticEntityRepository;
    }
@@ -116,6 +126,9 @@ public class EsServiceImpl implements EsService {
        timeInfo.setStartTime(requestEntity.getStartTime());
        timeInfo.setEndTime(requestEntity.getEndTime());
        timeInfo.setFieldName(requestEntity.getTimeFieldName());
        log.debug("es-server: " + esServer);
        ElasticPage elasticPage = getElasticEntityRepository().findEntity(requestEntity.getTableName(), fieldMap, timeInfo, pageInfo,sortMap);
        return ResponseResult.sucess(elasticPage.getTotalSize(),elasticPage.getResults());

src/main/resources/application.properties

@@ -2,5 +2,9 @@ server.port=8111
spring.application.name=elastic
es.server=10.19.29.37:10020
es.server.port=10021
#es.server=10.19.90.34:9200
es.server=10.19.14.26:9200
es.server.port=9200
es.server.username=
es.server.password=

src/main/resources/environment/dev/application.properties

@@ -2,5 +2,9 @@ server.port=8111
spring.application.name=elastic
es.server=8.130.50.1:10021
es.server.port=10021
#es.server=10.19.90.34:9200
es.server=10.19.14.26:9200
es.server.port=9200
es.server.username=elastic
es.server.password=Trustlink999

src/main/resources/environment/product/application.properties

@@ -2,5 +2,5 @@ server.port=8111
spring.application.name=elastic
es.server=8.130.50.1:10021
es.server.port=10021
es.server=10.19.14.26:9200
es.server.port=9200