|
@@ -177,6 +177,7 @@ class CollectorService implements CollectorServiceInterface
|
|
|
'second_end' => $data['second_end'],
|
|
'second_end' => $data['second_end'],
|
|
|
'end_pagenum' => $data['end_pagenum'],
|
|
'end_pagenum' => $data['end_pagenum'],
|
|
|
'start' => $data['start'],
|
|
'start' => $data['start'],
|
|
|
|
|
+ 'con_url' => $data['con_url'],
|
|
|
'title' => $data['title'],
|
|
'title' => $data['title'],
|
|
|
'content' => $data['content']
|
|
'content' => $data['content']
|
|
|
];
|
|
];
|
|
@@ -203,9 +204,9 @@ class CollectorService implements CollectorServiceInterface
|
|
|
// var_dump("============3============");
|
|
// var_dump("============3============");
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
|
- if(!empty($data['parameter']) && $data['type'] == 1){
|
|
|
|
|
|
|
+ if(!empty($data['con_start']) && $data['type'] == 1){
|
|
|
|
|
|
|
|
- $rule ['parameter'] = $data['parameter'];
|
|
|
|
|
|
|
+ $rule ['con_start'] = $data['con_start'];
|
|
|
}
|
|
}
|
|
|
if(!empty($data['source']) && $data['type'] != 3){
|
|
if(!empty($data['source']) && $data['type'] != 3){
|
|
|
|
|
|
|
@@ -252,7 +253,6 @@ class CollectorService implements CollectorServiceInterface
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
if(isset($data['keyWord'])){
|
|
if(isset($data['keyWord'])){
|
|
|
//若存在搜索词,则存到条件数组$where中
|
|
//若存在搜索词,则存到条件数组$where中
|
|
|
$where = [
|
|
$where = [
|
15313670163