diff --git a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java index 90f884f..c5b404d 100644 --- a/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java +++ b/novel-crawl/src/main/java/com/java2nb/novel/service/impl/CrawlServiceImpl.java @@ -255,12 +255,21 @@ public class CrawlServiceImpl implements CrawlService { while (page <= totalPage) { try { - - if (StringUtils.isNotBlank(ruleBean.getCatIdRule().get("catId" + catId))) { - //拼接分类URL - String catBookListUrl = ruleBean.getBookListUrl() - .replace("{catId}", ruleBean.getCatIdRule().get("catId" + catId)) - .replace("{page}", page + ""); + String catIdRule = ruleBean.getCatIdRule().get("catId" + catId); + if (StringUtils.isNotBlank(catIdRule)) { + String catBookListUrl = ""; + if (StringUtils.isNotBlank(ruleBean.getBookListUrl())) { + // 兼容老规则 + // 拼接分类URL + catBookListUrl = ruleBean.getBookListUrl() + .replace("{catId}", catIdRule) + .replace("{page}", page + ""); + } else { + // 新规则 + // 拼接分类URL + catBookListUrl = catIdRule.replace("{page}", page + ""); + } + log.info("catBookListUrl:{}", catBookListUrl); String bookListHtml = crawlHttpClient.get(catBookListUrl); if (bookListHtml != null) {