|
@@ -181,7 +181,7 @@ class Api
|
|
|
$this->page($config['param'], 3, $config, $col, $set);
|
|
|
} else {
|
|
|
Dever::load('spider/lib/project')->set($config, 4, 1);
|
|
|
- $this->parse($config['site'], $config['id'], $config['collect_rule'], $config['curl'], $col, $set, $config['push']);
|
|
|
+ $this->parse($config['site'], $config['id'], $config['collect_list_rule'], $config['collect_rule'], $config['curl'], $col, $set, $config['push']);
|
|
|
}
|
|
|
|
|
|
Dever::task(function() use($config, $this)
|
|
@@ -202,15 +202,15 @@ class Api
|
|
|
return Dever::db('spider/set')->getList(['where_pid' => $project]);
|
|
|
}
|
|
|
|
|
|
- private function parse($url, $project, $rule, $param, $col, $set, $push)
|
|
|
+ private function parse($url, $project, $list_rule, $rule, $param, $col, $set, $push)
|
|
|
{
|
|
|
$test = Dever::input('test');
|
|
|
if ($test == 1) {
|
|
|
- $parse = new Parse($url, $project, $rule, $param, $col, $set, $push);
|
|
|
+ $parse = new Parse($url, $project, $list_rule, $rule, $param, $col, $set, $push);
|
|
|
return $parse->get();
|
|
|
}
|
|
|
try {
|
|
|
- $parse = new Parse($url, $project, $rule, $param, $col, $set, $push);
|
|
|
+ $parse = new Parse($url, $project, $list_rule, $rule, $param, $col, $set, $push);
|
|
|
return $parse->get();
|
|
|
} catch (\Exception $e) {
|
|
|
return false;
|
|
@@ -241,7 +241,7 @@ class Api
|
|
|
} else {
|
|
|
$config['curl']['param'] = $site_page;
|
|
|
}
|
|
|
- $this->parse($site, $config['id'], $config['collect_rule'], $config['curl'], $col, $set, $config['push']);
|
|
|
+ $this->parse($site, $config['id'], $config['collect_list_rule'], $config['collect_rule'], $config['curl'], $col, $set, $config['push']);
|
|
|
}
|
|
|
}
|
|
|
}
|