From 0d96ff81b6f9f5c75768760a80c7cb11df7ab414 Mon Sep 17 00:00:00 2001
From: xiongxiaoyang <773861846@qq.com>
Date: Mon, 15 Jun 2020 17:47:12 +0800
Subject: [PATCH] =?UTF-8?q?v2.6.0=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/java2nb/novel/core/enums/ResponseStatus.java    | 2 +-
 .../com/java2nb/novel/service/impl/SearchServiceImpl.java    | 5 ++++-
 .../main/resources/templates/mobile/book/book_ranking.html   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java b/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java
index e3fb8bd..5eb3d5b 100644
--- a/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java
+++ b/novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java
@@ -66,7 +66,7 @@ public enum ResponseStatus {
     /**
      * 搜索引擎相关错误
      * */
-    ES_SEARCH_FAIL(9001,"密码错误！"),
+    ES_SEARCH_FAIL(9001,"搜索引擎查询错误！"),
 
 
     /**
diff --git a/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java b/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
index ca29f4a..5bbab2c 100644
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java
@@ -134,8 +134,8 @@ public class SearchServiceImpl implements SearchService {
         log.debug(search.toString());
         SearchResult result;
         result = jestClient.execute(search);
+        log.debug(result.getJsonString());
         if (result.isSucceeded()) {
-            log.debug(result.getJsonString());
 
             Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class);
             if (resultMap.get("hits") != null) {
@@ -196,4 +196,7 @@ public class SearchServiceImpl implements SearchService {
         }
        throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL);
     }
+
+
+
 }
diff --git a/novel-front/src/main/resources/templates/mobile/book/book_ranking.html b/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
index d3a0693..900d38e 100644
--- a/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
+++ b/novel-front/src/main/resources/templates/mobile/book/book_ranking.html
@@ -159,7 +159,7 @@
 
         if(sortBy != false){
             searchData.sort = sortBy;
-        }else{
+        }else if(!keyword){
             sortBy = "last_index_update_time";
         }