作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !912
... ... @@ -106,11 +106,11 @@ class HtmlCustomCollect extends Command
// 'https://www.citymax-group.com/case/field-experiment-crop-lettuce/',
// ];
$project_id = 626;
$project_site = 'v6-m342g.globalso.site';
$pages = [
'https://a574.goodao.net/project_catalog/project/',
'https://a574.goodao.net/project_catalog/project/page/2/',
// $project_id = 626;
// $project_site = 'v6-m342g.globalso.site';
// $pages = [
// 'https://a574.goodao.net/project_catalog/project/',
// 'https://a574.goodao.net/project_catalog/project/page/2/',
// 'https://www.lecusostreetlight.com/project/560pcs-250w-smart-led-street-light-in-manila-city-philippines/',
// 'https://www.lecusostreetlight.com/project/3200pcs-8m-150w-solar-street-light-in-cebu-philippines/',
// 'https://lecusostreetlight.com/project/170pcs-100w-split-lithium-battery-solar-street-light-in-tanzania/',
... ... @@ -134,7 +134,7 @@ class HtmlCustomCollect extends Command
// 'https://www.lecusostreetlight.com/project/198pcs-8m-80w-zc-series-all-in-two-solar-light-in-philippines/',
// 'https://www.lecusostreetlight.com/project/5m-30w-morden-led-garden-light-in-russian/',
// 'https://www.lecusostreetlight.com/project/135pcs-all-in-one-solar-street-light-in-uae-dubai-park/'
];
// ];
// $project_id = 633;
// $project_site = 'v6-ke5nz.globalso.site';
... ... @@ -175,6 +175,19 @@ class HtmlCustomCollect extends Command
// 'https://www.mach-sales.com/case/cooperation-win-win-and-starting-anew-sumec-creates-a-new-sample-of-strong-enterprise-cooperation/'
// ];
$project_id = 549;
$project_site = 'v6-myz64.globalso.site';
$pages = [
'https://sryled.goodao.net/event-staging/page/2/',
'https://sryled.goodao.net/event-staging/page/3/',
'https://sryled.goodao.net/event-staging/page/4/',
'https://sryled.goodao.net/advertising-3/page/2/',
'https://sryled.goodao.net/advertising-3/page/3/',
'https://sryled.goodao.net/advertising-3/page/4/',
'https://sryled.goodao.net/indoor/page/2/',
'https://sryled.goodao.net/indoor/page/3/',
];
foreach ($pages as $page) {
$this->start_collect(urldecode($page), $project_id, $project_site);
}
... ... @@ -314,6 +327,14 @@ class HtmlCustomCollect extends Command
$source[] = $check_vv2;
}
}
preg_match_all('/<iframe\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_3);
$video_3 = $result_video_3[2] ?? [];
foreach ($video_3 as $vv3) {
$check_vv3 = $this->url_check($vv3, $project_id, $domain, $web_url_domain, $home_url);
if ($check_vv3 && (!in_array($check_vv3, $source))) {
$source[] = $check_vv3;
}
}
//css
preg_match_all('/<link\s+[^>]*?href\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_css);
... ... @@ -401,7 +422,12 @@ class HtmlCustomCollect extends Command
foreach ($source as $vs) {
if ($vs['download']) {
$new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete']);
if (in_array(substr($vs['url_complete'], -3), ['pdf', 'zip', 'rar', '.gz'])) {
//可下载类资源要保持原名称
$new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete'], '', '', 1);
} else {
$new_source = CosService::uploadRemote($project_id, 'source', $vs['url_complete']);
}
if ($new_source) {
CollectSource::insert([
'project_id' => $project_id,
... ...