diff --git a/novel-admin/src/main/java/com/java2nb/books/service/impl/BookCrawlServiceImpl.java b/novel-admin/src/main/java/com/java2nb/books/service/impl/BookCrawlServiceImpl.java index f4bfaf3..23f9e49 100644 --- a/novel-admin/src/main/java/com/java2nb/books/service/impl/BookCrawlServiceImpl.java +++ b/novel-admin/src/main/java/com/java2nb/books/service/impl/BookCrawlServiceImpl.java @@ -565,11 +565,12 @@ public class BookCrawlServiceImpl implements BookCrawlService { //查询章节内容 - String body3 = getByHttpClient(contentUrl); + String body3 = getByHttpClient(contentUrl.replace("//m.","//www.")); if (body3 != null) { - String start = "『章节错误,点此举报』"; - String end = "『加入书签,方便阅读』"; - String content = body3.substring(body3.indexOf(start) + start.length(), body3.indexOf(end)); + String start = "id=\"content\">"; + String end = "<script>"; + String content = body3.substring(body3.indexOf(start) + start.length()); + content = "<div class=\"article-content font16\" id=\"ChapterBody\" data-class=\"font16\">"+content.substring(0,content.indexOf(end))+"</div>"; //TODO插入章节目录和章节内容 BookIndexDO bookIndex = new BookIndexDO(); bookIndex.setIndexName(indexName); diff --git a/novel-admin/src/main/resources/application.yml b/novel-admin/src/main/resources/application.yml index f8b7f5d..a3d3fd0 100644 --- a/novel-admin/src/main/resources/application.yml +++ b/novel-admin/src/main/resources/application.yml @@ -36,8 +36,8 @@ spring: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.jdbc.Driver url: jdbc:mysql://127.0.0.1:3306/books?useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai - username: root - password: test123456 + username: books + password: books #password: initialSize: 1 minIdle: 3 diff --git a/novel-front/src/main/java/xyz/zinglizingli/common/crawl/BiquCrawlSource.java b/novel-front/src/main/java/xyz/zinglizingli/common/crawl/BiquCrawlSource.java index 1c8a694..373dfd9 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/common/crawl/BiquCrawlSource.java +++ b/novel-front/src/main/java/xyz/zinglizingli/common/crawl/BiquCrawlSource.java @@ -142,11 +142,12 @@ public class BiquCrawlSource extends BaseHtmlCrawlSource { //查询章节内容 - String body3 = RestTemplateUtil.getBodyByUtf8(contentUrl); + String body3 = RestTemplateUtil.getBodyByUtf8(contentUrl.replace("//m.","//www.")); if (body3 != null) { - String start = "『章节错误,点此举报』"; - String end = "『加入书签,方便阅读』"; - String content = body3.substring(body3.indexOf(start) + start.length(), body3.indexOf(end)); + String start = "id=\"content\">"; + String end = "<script>"; + String content = body3.substring(body3.indexOf(start) + start.length()); + content = "<div class=\"article-content font16\" id=\"ChapterBody\" data-class=\"font16\">"+content.substring(0,content.indexOf(end))+"</div>"; //TODO插入章节目录和章节内容 BookIndex bookIndex = new BookIndex(); bookIndex.setIndexName(indexName); diff --git a/novel-front/src/main/resources/templates/books/book_content.html b/novel-front/src/main/resources/templates/books/book_content.html index 971c767..e557ee8 100644 --- a/novel-front/src/main/resources/templates/books/book_content.html +++ b/novel-front/src/main/resources/templates/books/book_content.html @@ -434,8 +434,8 @@ <div id="chaptercontent" class="Readarea ReadAjax_content screen_container" style="color: rgb(0, 0, 0); font-size: 25px;"> <p style="width:100%;text-alight:center; overflow: auto;-webkit-overflow-scrolling:touch;" > - <a - href="javascript:void(0);" th:utext="${bookContent.content}"></a></p> + <span + th:utext="${bookContent.content}"></span></p> </div> <div class="indexDiv" style="height: 42px;line-height: 42px;text-align:center;background: #f2f2f2"> diff --git a/script/crawlbook/application.yml b/script/crawlbook/application.yml index 82a20a2..8b2be98 100644 --- a/script/crawlbook/application.yml +++ b/script/crawlbook/application.yml @@ -9,6 +9,6 @@ mybatis: mysql: {charset: utf8mb4} books: {lowestScore: '8.5'} crawl: - website: {type: '1'} - soft-novel: '1' + website: {type: '2'} + soft-novel: '0' manhua: '0' diff --git a/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar b/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar index 4a186ff..741baa8 100644 Binary files a/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar and b/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar differ