Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zlt2000
microservices-platform
提交
b0768b85
microservices-platform
项目概览
zlt2000
/
microservices-platform
8 个月 前同步成功
通知
16
Star
4
Fork
3
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
microservices-platform
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b0768b85
编写于
2月 04, 2021
作者:
zlt2000
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
升级spring-data-elasticsearch到4.1.3
上级
dc4b6e21
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
27 deletion
+23
-27
pom.xml
pom.xml
+1
-1
zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
...java/com/central/admin/service/impl/IndexServiceImpl.java
+8
-8
zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java
...m/central/search/service/impl/AggregationServiceImpl.java
+3
-5
zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/SearchServiceImpl.java
...va/com/central/search/service/impl/SearchServiceImpl.java
+5
-4
zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/utils/SearchBuilder.java
...ter/src/main/java/com/central/es/utils/SearchBuilder.java
+6
-9
未找到文件。
pom.xml
浏览文件 @
b0768b85
...
...
@@ -47,7 +47,7 @@
<spring-social-security.version>
1.1.6.RELEASE
</spring-social-security.version>
<commons-io.version>
2.6
</commons-io.version>
<servlet-api.version>
4.0.1
</servlet-api.version>
<spring-data-elasticsearch.version>
3.2.10.RELEASE
</spring-data-elasticsearch.version>
<spring-data-elasticsearch.version>
4.1.3
</spring-data-elasticsearch.version>
<elasticsearch.version>
7.10.2
</elasticsearch.version>
<knife4j.version>
2.0.5
</knife4j.version>
<hibernate-validator.version>
6.2.0.Final
</hibernate-validator.version>
...
...
zlt-business/search-center/search-server/src/main/java/com/central/admin/service/impl/IndexServiceImpl.java
浏览文件 @
b0768b85
...
...
@@ -8,6 +8,7 @@ import com.central.common.utils.JsonUtil;
import
com.fasterxml.jackson.core.type.TypeReference
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
org.apache.http.util.EntityUtils
;
import
org.elasticsearch.client.RestHighLevelClient
;
import
org.elasticsearch.client.indices.CreateIndexRequest
;
import
org.elasticsearch.client.indices.CreateIndexResponse
;
import
org.elasticsearch.client.indices.GetIndexRequest
;
...
...
@@ -21,7 +22,6 @@ import org.elasticsearch.cluster.metadata.AliasMetadata;
import
org.elasticsearch.cluster.metadata.MappingMetadata
;
import
org.elasticsearch.common.settings.Settings
;
import
org.elasticsearch.common.xcontent.XContentType
;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.stereotype.Service
;
import
java.io.IOException
;
...
...
@@ -40,10 +40,10 @@ import java.util.*;
public
class
IndexServiceImpl
implements
IIndexService
{
private
ObjectMapper
mapper
=
new
ObjectMapper
();
private
final
ElasticsearchRestTemplate
elasticsearchRestTemplate
;
private
final
RestHighLevelClient
client
;
public
IndexServiceImpl
(
ElasticsearchRestTemplate
elasticsearchRestTemplate
)
{
this
.
elasticsearchRestTemplate
=
elasticsearchRestTemplate
;
public
IndexServiceImpl
(
RestHighLevelClient
client
)
{
this
.
client
=
client
;
}
@Override
...
...
@@ -57,7 +57,7 @@ public class IndexServiceImpl implements IIndexService {
//mappings
request
.
mapping
(
indexDto
.
getMappingsSource
(),
XContentType
.
JSON
);
}
CreateIndexResponse
response
=
elasticsearchRestTemplate
.
getClient
()
CreateIndexResponse
response
=
client
.
indices
()
.
create
(
request
,
RequestOptions
.
DEFAULT
);
return
response
.
isAcknowledged
();
...
...
@@ -66,7 +66,7 @@ public class IndexServiceImpl implements IIndexService {
@Override
public
boolean
delete
(
String
indexName
)
throws
IOException
{
DeleteIndexRequest
request
=
new
DeleteIndexRequest
(
indexName
);
AcknowledgedResponse
response
=
elasticsearchRestTemplate
.
getClient
()
.
indices
().
delete
(
request
,
RequestOptions
.
DEFAULT
);
AcknowledgedResponse
response
=
client
.
indices
().
delete
(
request
,
RequestOptions
.
DEFAULT
);
return
response
.
isAcknowledged
();
}
...
...
@@ -75,7 +75,7 @@ public class IndexServiceImpl implements IIndexService {
if
(
StrUtil
.
isNotEmpty
(
queryStr
))
{
indices
=
queryStr
;
}
Response
response
=
elasticsearchRestTemplate
.
getClient
()
.
getLowLevelClient
()
Response
response
=
client
.
getLowLevelClient
()
.
performRequest
(
new
Request
(
"GET"
,
"/_cat/indices?h=health,status,index,docsCount,docsDeleted,storeSize&s=cds:desc&format=json&index="
+
StrUtil
.
nullToEmpty
(
indices
)
...
...
@@ -93,7 +93,7 @@ public class IndexServiceImpl implements IIndexService {
@Override
public
Map
<
String
,
Object
>
show
(
String
indexName
)
throws
IOException
{
GetIndexRequest
request
=
new
GetIndexRequest
(
indexName
);
GetIndexResponse
getIndexResponse
=
elasticsearchRestTemplate
.
getClient
()
GetIndexResponse
getIndexResponse
=
client
.
indices
().
get
(
request
,
RequestOptions
.
DEFAULT
);
MappingMetadata
mappingMetadata
=
getIndexResponse
.
getMappings
().
get
(
indexName
);
Map
<
String
,
Object
>
mappOpenMap
=
mappingMetadata
.
getSourceAsMap
();
...
...
zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/AggregationServiceImpl.java
浏览文件 @
b0768b85
...
...
@@ -16,7 +16,6 @@ import org.elasticsearch.search.aggregations.bucket.range.Range;
import
org.elasticsearch.search.aggregations.bucket.terms.Terms
;
import
org.elasticsearch.search.aggregations.metrics.ParsedCardinality
;
import
org.elasticsearch.search.builder.SearchSourceBuilder
;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.stereotype.Service
;
import
java.io.IOException
;
...
...
@@ -41,10 +40,10 @@ import java.util.Map;
*/
@Service
public
class
AggregationServiceImpl
implements
IAggregationService
{
private
final
ElasticsearchRestTemplate
elasticsearchRestTemplate
;
private
final
RestHighLevelClient
client
;
public
AggregationServiceImpl
(
ElasticsearchRestTemplate
elasticsearchRestTemplate
)
{
this
.
elasticsearchRestTemplate
=
elasticsearchRestTemplate
;
public
AggregationServiceImpl
(
RestHighLevelClient
client
)
{
this
.
client
=
client
;
}
/**
...
...
@@ -219,7 +218,6 @@ public class AggregationServiceImpl implements IAggregationService {
)
).
size
(
0
);
RestHighLevelClient
client
=
elasticsearchRestTemplate
.
getClient
();
SearchResponse
response
=
client
.
search
(
searchRequest
,
RequestOptions
.
DEFAULT
);
Aggregations
aggregations
=
response
.
getAggregations
();
Map
<
String
,
Object
>
result
=
new
HashMap
<>(
15
);
...
...
zlt-business/search-center/search-server/src/main/java/com/central/search/service/impl/SearchServiceImpl.java
浏览文件 @
b0768b85
...
...
@@ -5,6 +5,7 @@ import com.central.es.utils.SearchBuilder;
import
com.central.search.model.SearchDto
;
import
com.central.search.service.ISearchService
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
org.elasticsearch.client.RestHighLevelClient
;
import
org.elasticsearch.search.sort.SortOrder
;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.stereotype.Service
;
...
...
@@ -19,10 +20,10 @@ import java.io.IOException;
*/
@Service
public
class
SearchServiceImpl
implements
ISearchService
{
private
final
ElasticsearchRestTemplate
elasticsearchRestTemplate
;
private
final
RestHighLevelClient
client
;
public
SearchServiceImpl
(
ElasticsearchRestTemplate
elasticsearchRestTemplate
)
{
this
.
elasticsearchRestTemplate
=
elasticsearchRestTemplate
;
public
SearchServiceImpl
(
RestHighLevelClient
client
)
{
this
.
client
=
client
;
}
/**
...
...
@@ -33,7 +34,7 @@ public class SearchServiceImpl implements ISearchService {
*/
@Override
public
PageResult
<
JsonNode
>
strQuery
(
String
indexName
,
SearchDto
searchDto
)
throws
IOException
{
return
SearchBuilder
.
builder
(
elasticsearchRestTemplate
,
indexName
)
return
SearchBuilder
.
builder
(
client
,
indexName
)
.
setStringQuery
(
searchDto
.
getQueryStr
())
.
addSort
(
searchDto
.
getSortCol
(),
SortOrder
.
DESC
)
.
setIsHighlight
(
searchDto
.
getIsHighlighter
())
...
...
zlt-commons/zlt-elasticsearch-spring-boot-starter/src/main/java/com/central/es/utils/SearchBuilder.java
浏览文件 @
b0768b85
...
...
@@ -22,8 +22,7 @@ import org.elasticsearch.search.builder.SearchSourceBuilder;
import
org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder
;
import
org.elasticsearch.search.fetch.subphase.highlight.HighlightField
;
import
org.elasticsearch.search.sort.SortOrder
;
import
org.springframework.data.elasticsearch.ElasticsearchException
;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.data.elasticsearch.UncategorizedElasticsearchException
;
import
java.io.IOException
;
import
java.lang.reflect.InvocationTargetException
;
...
...
@@ -65,26 +64,24 @@ public class SearchBuilder {
/**
* 生成SearchBuilder实例
* @param
elasticsearchTemplate
* @param
client
* @param indexName
*/
public
static
SearchBuilder
builder
(
ElasticsearchRestTemplate
elasticsearchTemplate
,
String
indexName
)
{
public
static
SearchBuilder
builder
(
RestHighLevelClient
client
,
String
indexName
)
{
SearchSourceBuilder
searchSourceBuilder
=
new
SearchSourceBuilder
();
SearchRequest
searchRequest
=
new
SearchRequest
(
indexName
);
searchRequest
.
source
(
searchSourceBuilder
);
RestHighLevelClient
client
=
elasticsearchTemplate
.
getClient
();
return
new
SearchBuilder
(
searchRequest
,
searchSourceBuilder
,
client
);
}
/**
* 生成SearchBuilder实例
* @param
elasticsearchTemplate
* @param
client
*/
public
static
SearchBuilder
builder
(
ElasticsearchRestTemplate
elasticsearchTemplate
)
{
public
static
SearchBuilder
builder
(
RestHighLevelClient
client
)
{
SearchSourceBuilder
searchSourceBuilder
=
new
SearchSourceBuilder
();
SearchRequest
searchRequest
=
new
SearchRequest
();
searchRequest
.
source
(
searchSourceBuilder
);
RestHighLevelClient
client
=
elasticsearchTemplate
.
getClient
();
return
new
SearchBuilder
(
searchRequest
,
searchSourceBuilder
,
client
);
}
...
...
@@ -266,7 +263,7 @@ public class SearchBuilder {
}
}
}
catch
(
InvocationTargetException
|
IllegalAccessException
|
NoSuchMethodException
e
)
{
throw
new
ElasticsearchException
(
"failed to set highlighted value for field: "
+
field
.
getName
()
throw
new
Uncategorized
ElasticsearchException
(
"failed to set highlighted value for field: "
+
field
.
getName
()
+
" with value: "
+
Arrays
.
toString
(
field
.
getFragments
()),
e
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录