diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqudaoConfig.java b/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqudaoConfig.java index aa20164..4c207cb 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqudaoConfig.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqudaoConfig.java @@ -19,7 +19,7 @@ public class CrawlBiqudaoConfig { @Bean @ConfigurationProperties(prefix = "biqudao.crawlsource") // prefix值必须是application.yml中对应属性的前缀 @ConditionalOnProperty(prefix = "biqudao.crawlsource",name = "enabled",havingValue = "true") - public BaseHtmlCrawlSource BiqutaCrawlSource() { + public BaseHtmlCrawlSource biqudaoCrawlSource() { return new BiquCrawlSource(); } diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqutaConfig.java b/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqutaConfig.java index 5e21c2f..d149268 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqutaConfig.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlBiqutaConfig.java @@ -5,7 +5,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; import xyz.zinglizingli.books.core.crawl.BaseHtmlCrawlSource; import xyz.zinglizingli.books.core.crawl.BiquCrawlSource; @@ -18,10 +17,9 @@ public class CrawlBiqutaConfig { @Bean - @Primary //必须加此注解,不然报错,下一个类则不需要添加 @ConfigurationProperties(prefix = "biquta.crawlsource") // prefix值必须是application.yml中对应属性的前缀 @ConditionalOnProperty(prefix = "biquta.crawlsource",name = "enabled",havingValue = "true") - public BaseHtmlCrawlSource BiqutaCrawlSource() { + public BaseHtmlCrawlSource biqutaCrawlSource() { return new BiquCrawlSource(); } diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlDingdianConfig.java b/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlDingdianConfig.java new file mode 100644 index 0000000..17fc2ce --- /dev/null +++ b/novel-front/src/main/java/xyz/zinglizingli/books/core/config/CrawlDingdianConfig.java @@ -0,0 +1,29 @@ +package xyz.zinglizingli.books.core.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; +import xyz.zinglizingli.books.core.crawl.BaseHtmlCrawlSource; +import xyz.zinglizingli.books.core.crawl.BiquCrawlSource; + +/** + * @author 11797 + */ +@Slf4j +@Configuration +public class CrawlDingdianConfig { + + + @Bean + @Primary //必须加此注解,不然报错,下一个类则不需要添加 + @ConfigurationProperties(prefix = "dingdian.crawlsource") // prefix值必须是application.yml中对应属性的前缀 + @ConditionalOnProperty(prefix = "dingdian.crawlsource",name = "enabled",havingValue = "true") + public BaseHtmlCrawlSource dingdianCrawlSource() { + return new BiquCrawlSource(); + } + + +} diff --git a/novel-front/src/main/java/xyz/zinglizingli/books/core/crawl/BiquCrawlSource.java b/novel-front/src/main/java/xyz/zinglizingli/books/core/crawl/BiquCrawlSource.java index 001f8af..ec567a2 100644 --- a/novel-front/src/main/java/xyz/zinglizingli/books/core/crawl/BiquCrawlSource.java +++ b/novel-front/src/main/java/xyz/zinglizingli/books/core/crawl/BiquCrawlSource.java @@ -141,7 +141,7 @@ public class BiquCrawlSource extends BaseHtmlCrawlSource { //查询章节内容 - String body3 = RestTemplateUtil.getBodyByUtf8(contentUrl.replace("//m.","//www.")); + String body3 = RestTemplateUtil.getBodyByUtf8(contentUrl.replace("//m.","//www.").replace("//wap.","//www.")); if (body3 != null) { String start = "id=\"content\">"; String end = "