diff --git a/service/picc.js b/service/picc.js index 1c71478..122f599 100644 --- a/service/picc.js +++ b/service/picc.js @@ -39,7 +39,7 @@ class PICC { pagenumber: 1, stopWhen: (pagenumber, result) => { return ( - pagenumber >= result.pages || pagenumber >= config.pageNumberLimit + pagenumber >= result.pages || result.stopFlag ); }, readyForNext: (pagenumber, result) => { @@ -119,6 +119,7 @@ class PICC { let total = result[1].res.total; let pages = Math.ceil(total / 10); let arr = result[1].res.rows; + let stopFlag = false; for (let i = 0; i < arr.length; i++) { let item = arr[i]; @@ -144,8 +145,11 @@ class PICC { urls: `https://ec.picc.com/cms/default/webfile${item.url}`, }); } + if(endTime&&+new Date(endTime) < Date.now()){//初始化时,遇到结束时间 早于 当前时间则停止 + stopFlag = true; + } } - return { pages, info }; + return { pages, info, stopFlag }; } } // 分页获取数据