周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 eaa9179fbe37b6cd85dedbee82c17616cbf714ed 2 个父辈 f2aa3bdc e6a928b9

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !175
内嵌 并排对比
正在显示 2 个修改的文件 包含 56 行增加 和 20 行删除
@@ -349,16 +349,25 @@ class HtmlCollect extends Command @@ -349,16 +349,25 @@ class HtmlCollect extends Command
349 $js_css_source = $result_source[1] ?? []; 349 $js_css_source = $result_source[1] ?? [];
350 if ($js_css_source) { 350 if ($js_css_source) {
351 foreach ($js_css_source as $vjs) { 351 foreach ($js_css_source as $vjs) {
352 - $vjs = str_replace('"', '', $vjs); 352 + $vjs_down = str_replace('"', '', $vjs);
  353 + $vjs_down_arr = parse_url($vjs_down);
  354 + $vjs_down_host = $vjs_down_arr['host'] ?? '';
353 355
354 - if (substr($vjs, 0, 1) != '/') { 356 + $cos = config('filesystems.disks.cos');
  357 + $cosCdn = $cos['cdn'];
  358 +
  359 + if ($vjs_down_host == $cosCdn) {
  360 + //过滤已经下载的
  361 + continue;
  362 + }
  363 +
  364 + if (empty($vjs_down_host) && substr($vjs_down, 0, 1) != '/') {
355 //相对路径 365 //相对路径
356 $url_arr = explode('/', $vs['url']); 366 $url_arr = explode('/', $vs['url']);
357 - $url_arr[count($url_arr) - 1] = $vjs; 367 + $url_arr[count($url_arr) - 1] = $vjs_down;
358 $vjs_down = implode('/', $url_arr); 368 $vjs_down = implode('/', $url_arr);
359 - } else {  
360 - $vjs_down = $vjs;  
361 } 369 }
  370 +
362 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); 371 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url);
363 if (!$vjs_result) { 372 if (!$vjs_result) {
364 continue; 373 continue;
@@ -401,16 +410,25 @@ class HtmlCollect extends Command @@ -401,16 +410,25 @@ class HtmlCollect extends Command
401 $js_css_source = $result_source[1] ?? []; 410 $js_css_source = $result_source[1] ?? [];
402 if ($js_css_source) { 411 if ($js_css_source) {
403 foreach ($js_css_source as $vjs) { 412 foreach ($js_css_source as $vjs) {
404 - $vjs = str_replace('"', '', $vjs); 413 + $vjs_down = str_replace('"', '', $vjs);
  414 + $vjs_down_arr = parse_url($vjs_down);
  415 + $vjs_down_host = $vjs_down_arr['host'] ?? '';
405 416
406 - if (substr($vjs, 0, 1) != '/') { 417 + $cos = config('filesystems.disks.cos');
  418 + $cosCdn = $cos['cdn'];
  419 +
  420 + if ($vjs_down_host == $cosCdn) {
  421 + //过滤已经下载的
  422 + continue;
  423 + }
  424 +
  425 + if (empty($vjs_down_host) && substr($vjs_down, 0, 1) != '/') {
407 //相对路径 426 //相对路径
408 $url_arr = explode('/', $vs['url']); 427 $url_arr = explode('/', $vs['url']);
409 - $url_arr[count($url_arr) - 1] = $vjs; 428 + $url_arr[count($url_arr) - 1] = $vjs_down;
410 $vjs_down = implode('/', $url_arr); 429 $vjs_down = implode('/', $url_arr);
411 - } else {  
412 - $vjs_down = $vjs;  
413 } 430 }
  431 +
414 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); 432 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url);
415 if (!$vjs_result) { 433 if (!$vjs_result) {
416 continue; 434 continue;
@@ -349,16 +349,25 @@ class HtmlLanguageCollect extends Command @@ -349,16 +349,25 @@ class HtmlLanguageCollect extends Command
349 $js_css_source = $result_source[1] ?? []; 349 $js_css_source = $result_source[1] ?? [];
350 if ($js_css_source) { 350 if ($js_css_source) {
351 foreach ($js_css_source as $vjs) { 351 foreach ($js_css_source as $vjs) {
352 - $vjs = str_replace('"', '', $vjs); 352 + $vjs_down = str_replace('"', '', $vjs);
  353 + $vjs_down_arr = parse_url($vjs_down);
  354 + $vjs_down_host = $vjs_down_arr['host'] ?? '';
353 355
354 - if (substr($vjs, 0, 1) != '/') { 356 + $cos = config('filesystems.disks.cos');
  357 + $cosCdn = $cos['cdn'];
  358 +
  359 + if ($vjs_down_host == $cosCdn) {
  360 + //过滤已经下载的
  361 + continue;
  362 + }
  363 +
  364 + if (empty($vjs_down_host) && substr($vjs_down, 0, 1) != '/') {
355 //相对路径 365 //相对路径
356 $url_arr = explode('/', $vs['url']); 366 $url_arr = explode('/', $vs['url']);
357 - $url_arr[count($url_arr) - 1] = $vjs; 367 + $url_arr[count($url_arr) - 1] = $vjs_down;
358 $vjs_down = implode('/', $url_arr); 368 $vjs_down = implode('/', $url_arr);
359 - } else {  
360 - $vjs_down = $vjs;  
361 } 369 }
  370 +
362 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); 371 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url);
363 if (!$vjs_result) { 372 if (!$vjs_result) {
364 continue; 373 continue;
@@ -401,16 +410,25 @@ class HtmlLanguageCollect extends Command @@ -401,16 +410,25 @@ class HtmlLanguageCollect extends Command
401 $js_css_source = $result_source[1] ?? []; 410 $js_css_source = $result_source[1] ?? [];
402 if ($js_css_source) { 411 if ($js_css_source) {
403 foreach ($js_css_source as $vjs) { 412 foreach ($js_css_source as $vjs) {
404 - $vjs = str_replace('"', '', $vjs); 413 + $vjs_down = str_replace('"', '', $vjs);
  414 + $vjs_down_arr = parse_url($vjs_down);
  415 + $vjs_down_host = $vjs_down_arr['host'] ?? '';
405 416
406 - if (substr($vjs, 0, 1) != '/') { 417 + $cos = config('filesystems.disks.cos');
  418 + $cosCdn = $cos['cdn'];
  419 +
  420 + if ($vjs_down_host == $cosCdn) {
  421 + //过滤已经下载的
  422 + continue;
  423 + }
  424 +
  425 + if (empty($vjs_down_host) && substr($vjs_down, 0, 1) != '/') {
407 //相对路径 426 //相对路径
408 $url_arr = explode('/', $vs['url']); 427 $url_arr = explode('/', $vs['url']);
409 - $url_arr[count($url_arr) - 1] = $vjs; 428 + $url_arr[count($url_arr) - 1] = $vjs_down;
410 $vjs_down = implode('/', $url_arr); 429 $vjs_down = implode('/', $url_arr);
411 - } else {  
412 - $vjs_down = $vjs;  
413 } 430 }
  431 +
414 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url); 432 $vjs_result = $this->url_check($vjs_down, $project_id, $domain, $web_url_domain, $home_url);
415 if (!$vjs_result) { 433 if (!$vjs_result) {
416 continue; 434 continue;