作者 刘锟

update

... ... @@ -103,7 +103,7 @@ class HtmlSpecialCollect extends Command
$source_list = $this->html_preg($new_html, $project_id, $collect_info->domain, $old_info['web_url_domain'], $old_info['home_url']);
if ($source_list) {
$html = $this->upload_source($html, array_unique($source_list), $project_id, $collect_info->domain, $old_info['web_url_domain'], $old_info['home_url']);
$html = $this->upload_source($html, $source_list, $project_id, $collect_info->domain, $old_info['web_url_domain'], $old_info['home_url']);
}
} catch (\Exception $e) {
$collect_info->status = CollectTask::STATUS_FAIL;
... ... @@ -198,7 +198,9 @@ class HtmlSpecialCollect extends Command
$img = $result_img[2] ?? [];
foreach ($img as $vi) {
$check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url);
$check_vi && $source[] = $check_vi;
if ($check_vi && (!in_array($check_vi, $source))) {
$check_vi && $source[] = $check_vi;
}
}
//js
... ... @@ -206,7 +208,9 @@ class HtmlSpecialCollect extends Command
$js = $result_js[2] ?? [];
foreach ($js as $vj) {
$check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url);
$check_vj && $source[] = $check_vj;
if ($check_vj && (!in_array($check_vj, $source))) {
$check_vj && $source[] = $check_vj;
}
}
//video
... ... @@ -214,7 +218,9 @@ class HtmlSpecialCollect extends Command
$video = $result_video[2] ?? [];
foreach ($video as $vv) {
$check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url);
$check_vv && $source[] = $check_vv;
if ($check_vv && (!in_array($check_vv, $source))) {
$check_vv && $source[] = $check_vv;
}
}
//css
... ... @@ -222,7 +228,9 @@ class HtmlSpecialCollect extends Command
$css = $result_css[2] ?? [];
foreach ($css as $vc) {
$check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url);
$check_vc && $source[] = $check_vc;
if ($check_vc && (!in_array($check_vc, $source))) {
$check_vc && $source[] = $check_vc;
}
}
//css background
... ... @@ -230,7 +238,9 @@ class HtmlSpecialCollect extends Command
$css_b = $result_css_b[1] ?? [];
foreach ($css_b as $vc_b) {
$check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url);
$check_vc_b && $source[] = $check_vc_b;
if ($check_vc_b && (!in_array($check_vc_b, $source))) {
$check_vc_b && $source[] = $check_vc_b;
}
}
//a标签下载资源
... ... @@ -238,7 +248,9 @@ class HtmlSpecialCollect extends Command
$down = $result_a[2] ?? [];
foreach ($down as $vd) {
$check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url);
$check_vd && $source[] = $check_vd;
if ($check_vd && (!in_array($check_vd, $source))) {
$check_vd && $source[] = $check_vd;
}
}
return $source;
... ... @@ -270,7 +282,6 @@ class HtmlSpecialCollect extends Command
) {
$source = CollectSource::where('project_id', $project_id)->where('origin', $url)->first();
if (!$source) {
echo $url . PHP_EOL;
return [
'download' => true,
'url' => $url,
... ...