v2.6.0发布

This commit is contained in:
xiongxiaoyang 2020-06-15 17:47:12 +08:00
parent 7733cf1e3f
commit 0d96ff81b6
3 changed files with 6 additions and 3 deletions

View File

@ -66,7 +66,7 @@ public enum ResponseStatus {
/** /**
* 搜索引擎相关错误 * 搜索引擎相关错误
* */ * */
ES_SEARCH_FAIL(9001,"密码错误!"), ES_SEARCH_FAIL(9001,"搜索引擎查询错误!"),
/** /**

View File

@ -134,8 +134,8 @@ public class SearchServiceImpl implements SearchService {
log.debug(search.toString()); log.debug(search.toString());
SearchResult result; SearchResult result;
result = jestClient.execute(search); result = jestClient.execute(search);
if (result.isSucceeded()) {
log.debug(result.getJsonString()); log.debug(result.getJsonString());
if (result.isSucceeded()) {
Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class); Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class);
if (resultMap.get("hits") != null) { if (resultMap.get("hits") != null) {
@ -196,4 +196,7 @@ public class SearchServiceImpl implements SearchService {
} }
throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL); throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL);
} }
} }

View File

@ -159,7 +159,7 @@
if(sortBy != false){ if(sortBy != false){
searchData.sort = sortBy; searchData.sort = sortBy;
}else{ }else if(!keyword){
sortBy = "last_index_update_time"; sortBy = "last_index_update_time";
} }