update readme

README.md

@@ -1,10 +1,10 @@
-[![index]( https://i.loli.net/2020/06/01/qF1uBMtswTIPJKx.jpg )]( https://www.eve.bz/cart.php?gid=11 )
+[![index]( https://s1.ax1x.com/2020/07/03/NOSA5q.jpg )]( https://cloud.tencent.com/act/cps/redirect?redirect=1052&cps_key=736e609d66e0ac4e57813316cec6fd0b&from=console )
 
 # 小说精品屋-plus
 
 #### 新项目：小说精品屋-微服务版
 
-基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台，可用于学习和商用。
+基于小说精品屋-plus构建的Spring Cloud 微服务小说门户平台。
 
 Gitee仓库地址： https://gitee.com/xiongxyang/novel-cloud
 
@@ -203,4 +203,4 @@ docker安装教程：[点击前往](https://my.oschina.net/java2nb/blog/4271989)
 
 精品小说屋所有相关项目均已在开源中国公开，感兴趣的可进入[开源中国](https://www.oschina.net/p/fiction_house)按关键字`精品小说屋`搜索。
 
-[![index](./assets/120060.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )
+[![index](https://s1.ax1x.com/2020/07/03/NOSuMF.jpg)](https://www.aliyun.com/minisite/goods?userCode=uf4nasee )

novel-admin/pom.xml

@@ -137,10 +137,6 @@
             <artifactId>velocity</artifactId>
             <version>1.7</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
         <!--<dependency>-->
         <!--<groupId>org.springframework.boot</groupId>-->
         <!--<artifactId>spring-boot-starter-data-redis</artifactId>-->

novel-admin/src/main/resources/application-dev.yml

@@ -12,7 +12,7 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/novel_plus?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
     username: root
-    password:
+    password: test123456
     #password:
     initialSize: 1
     minIdle: 3

novel-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.6.0</version>
+        <version>2.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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,"搜索引擎查询错误！"),
 
 
     /**

novel-crawl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.6.0</version>
+        <version>2.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-front/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>novel</artifactId>
         <groupId>com.java2nb</groupId>
-        <version>2.6.0</version>
+        <version>2.6.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

novel-front/src/main/java/com/java2nb/novel/core/utils/BrowserUtil.java

@@ -18,19 +18,20 @@ public class BrowserUtil {
             "lg-d", "lg-g", "lge-", "maui", "maxo", "midp", "mits", "mmef", "mobi", "mot-", "moto", "mwbp", "nec-",
             "newt", "noki", "oper", "palm", "pana", "pant", "phil", "play", "port", "prox", "qwap", "sage", "sams",
             "sany", "sch-", "sec-", "send", "seri", "sgh-", "shar", "sie-", "siem", "smal", "smar", "sony", "sph-",
-            "symb", "t-mo", "teli", "tim-", "tosh", "tsm-", "upg1", "upsi", "vk-v", "voda", "wap-", "wapa", "wapi",
+            "symb", "t-mo", "teli", "tim-",  "tsm-", "upg1", "upsi", "vk-v", "voda", "wap-", "wapa", "wapi",
             "wapp", "wapr", "webc", "winw", "winw", "xda", "xda-", "Googlebot-Mobile" };
 
     /**
      *
-     * @Title: JudgelsMobile @Description: TODO(判断是否是手机浏览器) @param @param
-     *         request @param @return 设定文件 @return boolean 返回类型 @throws
+     * 判断是否是手机浏览器
      */
     public static boolean isMobile(HttpServletRequest request) {
         boolean isMobile = false;
-        if (request.getHeader("User-Agent") != null) {
+        String userAgent = request.getHeader("User-Agent");
+        if (userAgent != null) {
+            userAgent = userAgent.toLowerCase();
             for (String mobileAgent : mobileAgents) {
-                if (request.getHeader("User-Agent").toLowerCase().indexOf(mobileAgent) > 0) {
+                if (userAgent.indexOf(mobileAgent) > 0) {
                     isMobile = true;
                     break;
                 }

novel-front/src/main/java/com/java2nb/novel/service/impl/FriendLinkServiceImpl.java

@@ -40,7 +40,7 @@ public class FriendLinkServiceImpl implements FriendLinkService {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
             result =  friendLinkMapper.selectMany(selectStatement);
-            cacheService.setObject(CacheKey.INDEX_LINK_KEY,result);
+            cacheService.setObject(CacheKey.INDEX_LINK_KEY,result,60 * 60 * 24);
         }
         return result;
     }

novel-front/src/main/java/com/java2nb/novel/service/impl/NewsServiceImpl.java

@@ -42,7 +42,7 @@ public class NewsServiceImpl implements NewsService {
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
             result = newsMapper.selectMany(selectStatement);
-            cacheService.setObject(CacheKey.INDEX_NEWS_KEY,result);
+            cacheService.setObject(CacheKey.INDEX_NEWS_KEY,result,60 * 60 * 12);
         }
         return result;
     }

novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java

@@ -93,7 +93,7 @@ public class SearchServiceImpl implements SearchService {
         boolQueryBuilder.filter(QueryBuilders.rangeQuery("wordCount").gte(params.getWordCountMin()).lte(params.getWordCountMax()));
 
         if (params.getUpdateTimeMin() != null) {
-            boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(params.getUpdateTimeMin()));
+            boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(params.getUpdateTimeMin())));
         }
 
 
@@ -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);
     }
+
+
+
 }

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";
         }
 

novel-front/src/main/resources/templates/mobile/index.html

@@ -58,13 +58,13 @@
 <ul  class="layui-nav app" lay-filter="" style="display:none;padding:0 10px;text-align: center">
     <li class="layui-nav-item"><a>分类</a>
         <dl class="layui-nav-child">
-            <dd><a href="/book/book_ranking.html?catId=1">玄幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=2">修真小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=3">都市小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=4">历史小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=6">网游小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=5">科幻小说</a></dd>
-            <dd><a href="/book/book_ranking.html?catId=7">女频小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=1&sort=last_index_update_time">玄幻小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=2&sort=last_index_update_time">修真小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=3&sort=last_index_update_time">都市小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=4&sort=last_index_update_time">历史小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=6&sort=last_index_update_time">网游小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=5&sort=last_index_update_time">科幻小说</a></dd>
+            <dd><a href="/book/book_ranking.html?catId=7&sort=last_index_update_time">女频小说</a></dd>
         </dl>
     </li>
     <li class="layui-nav-item"><a>全本</a>
@@ -95,13 +95,13 @@
 
 </ul>
 <ul class="layui-nav pc" lay-filter="" style="padding:0 36px;text-align: center">
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=1">玄幻小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=2">修真小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=3">都市小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=4">历史小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=6">网游小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=5">科幻小说</a></li>
-    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=7">女频小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=1&sort=last_index_update_time">玄幻小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=2&sort=last_index_update_time">修真小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=3&sort=last_index_update_time">都市小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=4&sort=last_index_update_time">历史小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=6&sort=last_index_update_time">网游小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=5&sort=last_index_update_time">科幻小说</a></li>
+    <li class="layui-nav-item"><a href="/book/book_ranking.html?catId=7&sort=last_index_update_time">女频小说</a></li>
     <li class="layui-nav-item"><a>完本小说</a>
         <dl class="layui-nav-child"> <!-- 二级菜单 -->
             <dd><a href="/book/book_ranking.html?bookStatus=1">全部小说</a></dd>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.java2nb</groupId>
     <artifactId>novel</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.2</version>
     <modules>
         <module>novel-common</module>
         <module>novel-front</module>

sql/novel_plus.sql

@@ -1831,4 +1831,8 @@ CREATE TABLE `crawl_single_task` (
 -- ----------------------------
 INSERT INTO `crawl_single_task` VALUES ('6', '2', '百书斋', '1', '1', '1', '1', '0', '5', '2020-06-15 14:36:07');
 INSERT INTO `crawl_single_task` VALUES ('7', '5', '笔趣阁', '108_108291', '1', '衍天志之不朽仙', '白衣少年丶', '1', '1', '2020-06-15 14:46:08');
-UPDATE `crawl_source` SET `source_name` = '书趣阁', `crawl_rule` = '{\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"7\",\n		\"catId6\": \"6\",\n		\"catId7\": \"8\"\n	},\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\n	\"bookStatusRule\": {\n		\"连载中\": 0,\n		\"完本\": 1\n	},\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\n	\"descEnd\": \"最新章节推荐地址\",\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\n	\"bookIndexStart\": \"<dt>《\",\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\n	\"contentEnd\": \"http://www.shuquge.com\"\n}', `source_status` = 1, `create_time` = '2020-05-18 12:02:34', `update_time` = '2020-05-18 12:02:34' WHERE `id` = 4;
+UPDATE `crawl_source` SET `source_name` = '书趣阁', `crawl_rule` = '{\n	\"bookListUrl\": \"http://m.shuquge.com/sort/{catId}/0_{page}.html\",\n	\"catIdRule\": {\n		\"catId1\": \"1\",\n		\"catId2\": \"2\",\n		\"catId3\": \"3\",\n		\"catId4\": \"4\",\n		\"catId5\": \"7\",\n		\"catId6\": \"6\",\n		\"catId7\": \"8\"\n	},\n	\"bookIdPatten\": \"href=\\\"/s/(\\\\d+)\\\\.html\\\"\",\n	\"pagePatten\": \"第(\\\\d+)/\\\\d+页\",\n	\"totalPagePatten\": \"第\\\\d+/(\\\\d+)页\",\n	\"bookDetailUrl\": \"http://m.shuquge.com/s/{bookId}.html\",\n	\"bookNamePatten\": \"<a\\\\s+href=\\\"/s/\\\\d+\\\\.html\\\"><h2>([^/]+)</h2></a>\",\n	\"authorNamePatten\": \"<p>作者：([^/]+)</p>\",\n	\"picUrlPatten\": \"src=\\\"(http://www.shuquge.com/files/article/image/\\\\d+/\\\\d+/\\\\d+s\\\\.jpg)\\\"\",\n	\"statusPatten\": \"<p>状态：([^/]+)</p>\",\n	\"bookStatusRule\": {\n		\"连载中\": 0,\n		\"完本\": 1\n	},\n	\"descStart\": \"<div class=\\\"intro_info\\\">\",\n	\"descEnd\": \"最新章节推荐地址\",\n	\"bookIndexUrl\": \"http://www.shuquge.com/txt/{bookId}/index.html\",\n	\"bookIndexStart\": \"<dt>《\",\n	\"indexIdPatten\": \"<dd><a\\\\s+href=\\\"(\\\\d+)\\\\.html\\\">[^/]+</a></dd>\",\n	\"indexNamePatten\": \"<dd><a\\\\s+href=\\\"\\\\d+\\\\.html\\\">([^/]+)</a></dd>\",\n	\"bookContentUrl\": \"http://www.shuquge.com/txt/{bookId}/{indexId}.html\",\n	\"contentStart\": \"<div id=\\\"content\\\" class=\\\"showtxt\\\">\",\n	\"contentEnd\": \"http://www.shuquge.com\"\n}', `source_status` = 1, `create_time` = '2020-05-18 12:02:34', `update_time` = '2020-05-18 12:02:34' WHERE `id` = 4;
+
+INSERT INTO `friend_link` ( `link_name`, `link_url`, `sort`, `is_open`, `create_user_id`, `create_time`, `update_user_id`, `update_time`) VALUES
+('小羊影视', 'http://video.java2nb.com/', 11, 1, NULL, NULL, NULL, NULL),
+('官方论坛', 'http://bbs.java2nb.com', 21, 1, NULL, NULL, NULL, NULL);