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 4c207cb..e3b3a94 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 @@ -18,7 +18,7 @@ public class CrawlBiqudaoConfig { @Bean @ConfigurationProperties(prefix = "biqudao.crawlsource") // prefix值必须是application.yml中对应属性的前缀 - @ConditionalOnProperty(prefix = "biqudao.crawlsource",name = "enabled",havingValue = "true") + @ConditionalOnProperty(prefix = "crawl.website",name = "type",havingValue = "1") 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 d149268..aca7457 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 @@ -18,7 +18,7 @@ public class CrawlBiqutaConfig { @Bean @ConfigurationProperties(prefix = "biquta.crawlsource") // prefix值必须是application.yml中对应属性的前缀 - @ConditionalOnProperty(prefix = "biquta.crawlsource",name = "enabled",havingValue = "true") + @ConditionalOnProperty(prefix = "crawl.website",name = "type",havingValue = "2") 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 index 17fc2ce..6acca88 100644 --- 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 @@ -20,7 +20,7 @@ public class CrawlDingdianConfig { @Bean @Primary //必须加此注解,不然报错,下一个类则不需要添加 @ConfigurationProperties(prefix = "dingdian.crawlsource") // prefix值必须是application.yml中对应属性的前缀 - @ConditionalOnProperty(prefix = "dingdian.crawlsource",name = "enabled",havingValue = "true") + @ConditionalOnProperty(prefix = "crawl.website",name = "type",havingValue = "3") public BaseHtmlCrawlSource dingdianCrawlSource() { return new BiquCrawlSource(); } diff --git a/novel-front/src/main/resources/application-crawl.yml b/novel-front/src/main/resources/application-crawl.yml index 7e72483..9b04bf2 100644 --- a/novel-front/src/main/resources/application-crawl.yml +++ b/novel-front/src/main/resources/application-crawl.yml @@ -9,7 +9,6 @@ crawl: #爬取的网站名称类型 1:笔趣岛 ,2:笔趣塔, 3:顶点,默认顶点 更多网站解析中,敬请期待 biquta: crawlsource: - enabled: true #是否开启此爬虫源 index-url: https://m.biquta.la list-page-url: https://m.biquta.la/class/{0}/{1}.html book-url-pattern: href="/(\d+_\d+)/" @@ -25,9 +24,8 @@ biquta: catalog-pattern: ([^/]+) biqudao: crawlsource: - enabled: true #是否开启此爬虫源 - index-url: https://m.biqudao.com - list-page-url: https://m.biqudao.com/bqgeclass/{0}/{1}.html + index-url: https://m.biqudao.net + list-page-url: https://m.biqudao.net/bqgeclass/{0}/{1}.html book-url-pattern: href="/(bqge\d+)/" score-pattern:
([^/]+)
@@ -42,9 +40,8 @@ biqudao: dingdian: crawlsource: - enabled: true #是否开启此爬虫源 - index-url: https://wap.dingdiann.com - list-page-url: https://wap.dingdiann.com/sort/{0}/{1}.html + index-url: http://m.xdingdiann.com + list-page-url: http://m.xdingdiann.com/sort/{0}/{1}.html book-url-pattern: href="/(ddk\d+)/" score-pattern:([^/]+)
@@ -59,7 +56,6 @@ dingdian: biquge: crawlsource: - enabled: true #是否开启此爬虫源 index-url: http://m.biquge.info list-page-url: http://m.biquge.info/paihangbang_lastupdate/{0}.html book-url-pattern: href="/(\d+_\d+)/" diff --git a/novel-front/src/main/resources/application.yml b/novel-front/src/main/resources/application.yml index 3298845..bc4b7f3 100644 --- a/novel-front/src/main/resources/application.yml +++ b/novel-front/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:3306/books?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: test123456 + password: # url: jdbc:mysql://127.0.0.1:3306/books?useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai # username: root # password: test123456 @@ -68,7 +68,7 @@ mysql: books: lowestScore: 6.0 -#爬取的网站名称类型 1:笔趣岛 ,2:笔趣塔 更多网站解析中,敬请期待 +#爬取的网站名称类型 1:笔趣岛 ,2:笔趣塔,3:顶点小说 更多网站解析中,敬请期待 crawl: website: type: 2 diff --git a/script/crawlbook/application.yml b/script/crawlbook/application.yml index 8b2be98..2eef3a4 100644 --- a/script/crawlbook/application.yml +++ b/script/crawlbook/application.yml @@ -1,7 +1,7 @@ server: {port: 8083} spring: datasource: {url: 'jdbc:mysql://127.0.0.1:3306/books?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai', - username: root, password: test123456} + username: root, password: ''} mybatis: mapper-locations: classpath:mybatis/mapping/*.xml type-aliases-package: xyz.zinglizingli.books.po diff --git a/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar b/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar index 21375d7..4e36922 100644 Binary files a/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar and b/script/crawlbook/crawl-book-1.0-SNAPSHOT.jar differ