修改ES鉴权方式

src/main/java/com/ai/abc/jpa/elastic/repository/ElasticEntityRepository.java

@@ -20,10 +20,10 @@ public interface ElasticEntityRepository {
    <T extends Serializable> ElasticPage<T> findEntity(String connectionName, Map<String, Object> hashMap, String startDate, String stopDate, PageInfo pageInfo);
    <T extends Serializable> ElasticPage<T> findEntity(Object entity, Date startDate, Date stopDate, PageInfo pageInfo);
//    <T extends Serializable> ElasticPage<T> findEntity(Object entity, Date startDate, Date stopDate, PageInfo pageInfo);
    public abstract <T extends Serializable> ElasticPage<T> findEntity(String paramString, Map<String, Object> paramMap, TimeInfo paramTimeInfo, PageInfo paramPageInfo, Map<String, String> paramMap1);
    <T extends Serializable> ElasticPage<T> findEntity(String paramString, Map<String, Object> paramMap, TimeInfo paramTimeInfo, PageInfo paramPageInfo, Map<String, String> paramMap1);
    long countSearch(String index,Map<String, Object> hashMap,TimeInfo timeInfo,String fuzzySearchStr) throws Exception;

src/main/java/com/ai/abc/jpa/elastic/repository/impl/ElasticEntityRepositoryImpl.java

@@ -88,8 +88,11 @@ public class ElasticEntityRepositoryImpl implements ElasticEntityRepository {
            Header[] headers = new Header[2];
            if(!StringUtils.isEmpty(userName) && !StringUtils.isEmpty(passWord)){
                headers[0] = new BasicHeader(HttpHeaders.AUTHORIZATION, userName+":"+passWord);
                headers[1] = new BasicHeader("Content-Type", "application/json");
//                headers[0] = new BasicHeader(HttpHeaders.AUTHORIZATION, "Basic " + userName+":"+passWord);
                headers[0] = new BasicHeader(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getUrlEncoder().encodeToString((userName + ":" + passWord).getBytes()));
                headers[1] = new BasicHeader("Content-Type", "application/json; charset=UTF-8");
                builder.setDefaultHeaders(headers);
            }
@@ -180,10 +183,6 @@ public class ElasticEntityRepositoryImpl implements ElasticEntityRepository {
    }
    @Override
    public <T extends Serializable> ElasticPage<T> findEntity(Object entity, Date startDate, Date stopDate, PageInfo pageInfo) {
        return null;
    }
    public <T extends Serializable> ElasticPage<T> findEntity(String connectionName, Map<String, Object> hashMap, TimeInfo timeInfo, PageInfo pageInfo, Map<String, String> sortMap)
    {
        SearchRequest searchRequest = new SearchRequest();
@@ -244,28 +243,30 @@ public class ElasticEntityRepositoryImpl implements ElasticEntityRepository {
        searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
        SearchResponse searchResponse = null;
        ElasticPage elasticPage = new ElasticPage();
        try {
            searchResponse = this.client.search(searchRequest, RequestOptions.DEFAULT);
            this.log.info("searchResponse=" + JSONObject.toJSONString(searchResponse));
            long totalSize = searchResponse.getHits().getTotalHits().value;
            Iterator serarchHits = searchResponse.getHits().iterator();
            List listResult = new ArrayList();
            while (serarchHits.hasNext()) {
                SearchHit searchHit = (SearchHit)serarchHits.next();
                JSONObject jsonObject = JSONObject.parseObject(searchHit.getSourceAsString());
                listResult.add(jsonObject);
            }
            this.log.info("listResult=" + listResult);
            elasticPage.setTotalSize(totalSize);
            elasticPage.setResults(listResult);
        } catch (IOException e) {
            this.log.error("elastic client.search error" + e.getLocalizedMessage());
            e.printStackTrace();
        }
        this.log.debug("searchResponse=" + searchResponse);
//            e.printStackTrace();
        ElasticPage elasticPage = new ElasticPage();
        long totalSize = searchResponse.getHits().getTotalHits().value;
        Iterator serarchHits = searchResponse.getHits().iterator();
        List listResult = new ArrayList();
        while (serarchHits.hasNext()) {
            SearchHit searchHit = (SearchHit)serarchHits.next();
            JSONObject jsonObject = JSONObject.parseObject(searchHit.getSourceAsString());
            listResult.add(jsonObject);
        }
        this.log.debug("listResult=" + listResult);
        elasticPage.setTotalSize(totalSize);
        elasticPage.setResults(listResult);
        return elasticPage;
    }

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

@@ -89,6 +89,7 @@ public class EsServiceImpl implements EsService {
    private ResponseResult findEsEntityList(RequestEntity requestEntity) {
        log.info("requestEntity:\n"+JSONObject.toJSONString(requestEntity));
        PageInfo pageInfo = new PageInfo();
        int pageSize = requestEntity.getPageSize() == null ? 0 : requestEntity.getPageSize();
        int startNum = requestEntity.getStartNumber() == null ? 0 : requestEntity.getStartNumber()*pageSize;
@@ -139,7 +140,7 @@ public class EsServiceImpl implements EsService {
        timeInfo.setEndTime(requestEntity.getEndTime());
        timeInfo.setFieldName(requestEntity.getTimeFieldName());
        log.debug("es-server: " + esServer);
        log.info("es-server: " + esServer);
        ElasticPage elasticPage = getElasticEntityRepository().findEntity(requestEntity.getTableName(), fieldMap, timeInfo, pageInfo,sortMap);

src/main/resources/application.properties

@@ -4,8 +4,8 @@ spring.application.name=elastic
management.health.elasticsearch.enabled=false
#es.server=10.19.90.34:9200
#es.server=8.130.50.1:10021
es.server=47.105.160.21:10021
es.server.port=10021
es.server=es-cn-i7m2fl6qw001hh6qu.public.elasticsearch.aliyuncs.com:9200
es.server.port=9200
es.server.username=
es.server.password=
es.server.username=elastic
es.server.password=Trustlink999

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

@@ -3,8 +3,8 @@ spring.application.name=elastic
#es.server=10.19.90.34:9200
es.server=8.130.50.1:10021
es.server.port=10021
es.server=es-cn-i7m2fl6qw001hh6qu.public.elasticsearch.aliyuncs.com:9200
es.server.port=9200
es.server.username=
es.server.password=
es.server.username=elastic
es.server.password=Trustlink999