|
@@ -87,12 +87,17 @@ function doCrawl(cat, force) {
|
|
|
let nextUrl = getUrlDay(date.toDate(), cat, page);
|
|
|
console.log(nextUrl);
|
|
|
let ret = [];
|
|
|
- request({
|
|
|
+ let params = {
|
|
|
uri: nextUrl,
|
|
|
transform: function (body) {
|
|
|
return cheerio.load(body);
|
|
|
}
|
|
|
- }).then(function ($) {
|
|
|
+ };
|
|
|
+
|
|
|
+ let proxy = settings().get('proxy');
|
|
|
+ if(proxy && proxy.active) params.proxy = `http://${proxy.host}:${proxy.port}`;
|
|
|
+
|
|
|
+ request(params).then(function ($) {
|
|
|
extractRows(r => {
|
|
|
r.date = parseInt(date.clone().startOf('day').format('x'));
|
|
|
r.category = cat;
|
|
@@ -163,7 +168,7 @@ function doAllCrawl() {
|
|
|
}, function (e) {
|
|
|
crawling = false;
|
|
|
console.error(e);
|
|
|
- throw e;
|
|
|
+ //throw e;
|
|
|
})
|
|
|
}
|
|
|
|