Sfoglia il codice sorgente

修改ES鉴权方式

wangdong6 2 anni fa
parent
commit
907e6b559a

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

20
20
21
    <T extends Serializable> ElasticPage<T> findEntity(String connectionName, Map<String, Object> hashMap, String startDate, String stopDate, PageInfo pageInfo);
21
    <T extends Serializable> ElasticPage<T> findEntity(String connectionName, Map<String, Object> hashMap, String startDate, String stopDate, PageInfo pageInfo);
22
22
23
    <T extends Serializable> ElasticPage<T> findEntity(Object entity, Date startDate, Date stopDate, PageInfo pageInfo);
23
//    <T extends Serializable> ElasticPage<T> findEntity(Object entity, Date startDate, Date stopDate, PageInfo pageInfo);
24
24
25
25
26
    public abstract <T extends Serializable> ElasticPage<T> findEntity(String paramString, Map<String, Object> paramMap, TimeInfo paramTimeInfo, PageInfo paramPageInfo, Map<String, String> paramMap1);
26
    <T extends Serializable> ElasticPage<T> findEntity(String paramString, Map<String, Object> paramMap, TimeInfo paramTimeInfo, PageInfo paramPageInfo, Map<String, String> paramMap1);
27
27
28
28
29
    long countSearch(String index,Map<String, Object> hashMap,TimeInfo timeInfo,String fuzzySearchStr) throws Exception;
29
    long countSearch(String index,Map<String, Object> hashMap,TimeInfo timeInfo,String fuzzySearchStr) throws Exception;

+ 23 - 22
src/main/java/com/ai/abc/jpa/elastic/repository/impl/ElasticEntityRepositoryImpl.java

88
88
89
            Header[] headers = new Header[2];
89
            Header[] headers = new Header[2];
90
            if(!StringUtils.isEmpty(userName) && !StringUtils.isEmpty(passWord)){
90
            if(!StringUtils.isEmpty(userName) && !StringUtils.isEmpty(passWord)){
91
                headers[0] = new BasicHeader(HttpHeaders.AUTHORIZATION, userName+":"+passWord);
92
                headers[1] = new BasicHeader("Content-Type", "application/json");
91
//                headers[0] = new BasicHeader(HttpHeaders.AUTHORIZATION, "Basic " + userName+":"+passWord);
92
                headers[0] = new BasicHeader(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getUrlEncoder().encodeToString((userName + ":" + passWord).getBytes()));
93
94
95
                headers[1] = new BasicHeader("Content-Type", "application/json; charset=UTF-8");
93
                builder.setDefaultHeaders(headers);
96
                builder.setDefaultHeaders(headers);
94
            }
97
            }
95
98
180
    }
183
    }
181
184
182
    @Override
185
    @Override
183
    public <T extends Serializable> ElasticPage<T> findEntity(Object entity, Date startDate, Date stopDate, PageInfo pageInfo) {
184
        return null;
185
    }
186
187
    public <T extends Serializable> ElasticPage<T> findEntity(String connectionName, Map<String, Object> hashMap, TimeInfo timeInfo, PageInfo pageInfo, Map<String, String> sortMap)
186
    public <T extends Serializable> ElasticPage<T> findEntity(String connectionName, Map<String, Object> hashMap, TimeInfo timeInfo, PageInfo pageInfo, Map<String, String> sortMap)
188
    {
187
    {
189
        SearchRequest searchRequest = new SearchRequest();
188
        SearchRequest searchRequest = new SearchRequest();
244
        searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
243
        searchRequest.searchType(SearchType.DFS_QUERY_THEN_FETCH);
245
244
246
        SearchResponse searchResponse = null;
245
        SearchResponse searchResponse = null;
246
        ElasticPage elasticPage = new ElasticPage();
247
        try {
247
        try {
248
            searchResponse = this.client.search(searchRequest, RequestOptions.DEFAULT);
248
            searchResponse = this.client.search(searchRequest, RequestOptions.DEFAULT);
249
250
            this.log.info("searchResponse=" + JSONObject.toJSONString(searchResponse));
251
252
253
            long totalSize = searchResponse.getHits().getTotalHits().value;
254
            Iterator serarchHits = searchResponse.getHits().iterator();
255
            List listResult = new ArrayList();
256
            while (serarchHits.hasNext()) {
257
                SearchHit searchHit = (SearchHit)serarchHits.next();
258
                JSONObject jsonObject = JSONObject.parseObject(searchHit.getSourceAsString());
259
                listResult.add(jsonObject);
260
            }
261
            this.log.info("listResult=" + listResult);
262
263
            elasticPage.setTotalSize(totalSize);
264
            elasticPage.setResults(listResult);
249
        } catch (IOException e) {
265
        } catch (IOException e) {
250
            this.log.error("elastic client.search error" + e.getLocalizedMessage());
266
            this.log.error("elastic client.search error" + e.getLocalizedMessage());
251
            e.printStackTrace();
252
        }
253
        this.log.debug("searchResponse=" + searchResponse);
267
//            e.printStackTrace();
254
268
255
        ElasticPage elasticPage = new ElasticPage();
256
        long totalSize = searchResponse.getHits().getTotalHits().value;
257
        Iterator serarchHits = searchResponse.getHits().iterator();
258
        List listResult = new ArrayList();
259
        while (serarchHits.hasNext()) {
260
            SearchHit searchHit = (SearchHit)serarchHits.next();
261
            JSONObject jsonObject = JSONObject.parseObject(searchHit.getSourceAsString());
262
            listResult.add(jsonObject);
263
        }
269
        }
264
        this.log.debug("listResult=" + listResult);
265
266
        elasticPage.setTotalSize(totalSize);
267
        elasticPage.setResults(listResult);
268
269
        return elasticPage;
270
        return elasticPage;
270
    }
271
    }
271
272

+ 2 - 1
src/main/java/com/ai/bss/es/esmanage/service/impl/EsServiceImpl.java

89
89
90
    private ResponseResult findEsEntityList(RequestEntity requestEntity) {
90
    private ResponseResult findEsEntityList(RequestEntity requestEntity) {
91
91
92
        log.info("requestEntity:\n"+JSONObject.toJSONString(requestEntity));
92
        PageInfo pageInfo = new PageInfo();
93
        PageInfo pageInfo = new PageInfo();
93
        int pageSize = requestEntity.getPageSize() == null ? 0 : requestEntity.getPageSize();
94
        int pageSize = requestEntity.getPageSize() == null ? 0 : requestEntity.getPageSize();
94
        int startNum = requestEntity.getStartNumber() == null ? 0 : requestEntity.getStartNumber()*pageSize;
95
        int startNum = requestEntity.getStartNumber() == null ? 0 : requestEntity.getStartNumber()*pageSize;
139
        timeInfo.setEndTime(requestEntity.getEndTime());
140
        timeInfo.setEndTime(requestEntity.getEndTime());
140
        timeInfo.setFieldName(requestEntity.getTimeFieldName());
141
        timeInfo.setFieldName(requestEntity.getTimeFieldName());
141
142
142
        log.debug("es-server: " + esServer);
143
        log.info("es-server: " + esServer);
143
144
144
        ElasticPage elasticPage = getElasticEntityRepository().findEntity(requestEntity.getTableName(), fieldMap, timeInfo, pageInfo,sortMap);
145
        ElasticPage elasticPage = getElasticEntityRepository().findEntity(requestEntity.getTableName(), fieldMap, timeInfo, pageInfo,sortMap);
145
146

+ 4 - 4
src/main/resources/application.properties

4
management.health.elasticsearch.enabled=false
4
management.health.elasticsearch.enabled=false
5
#es.server=10.19.90.34:9200
5
#es.server=10.19.90.34:9200
6
#es.server=8.130.50.1:10021
6
#es.server=8.130.50.1:10021
7
es.server=47.105.160.21:10021
8
es.server.port=10021
7
es.server=es-cn-i7m2fl6qw001hh6qu.public.elasticsearch.aliyuncs.com:9200
8
es.server.port=9200
9
9
10
es.server.username=
11
es.server.password=
10
es.server.username=elastic
11
es.server.password=Trustlink999

+ 4 - 4
src/main/resources/environment/dev/application.properties

3
3
4
4
5
#es.server=10.19.90.34:9200
5
#es.server=10.19.90.34:9200
6
es.server=8.130.50.1:10021
7
es.server.port=10021
6
es.server=es-cn-i7m2fl6qw001hh6qu.public.elasticsearch.aliyuncs.com:9200
7
es.server.port=9200
8
8
9
es.server.username=
10
es.server.password=
9
es.server.username=elastic
10
es.server.password=Trustlink999