Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

lyh
app/Console/Commands/Update/HtmlCollect.php
app/Console/Commands/Update/HtmlCustomCollect.php
app/Console/Commands/Update/HtmlLanguageCollect.php
app/Console/Commands/Update/ProjectUpdate.php
--- a/app/Console/Commands/Update/HtmlCollect.php
查看文件 @bec57d0
+++ b/app/Console/Commands/Update/HtmlCollect.php
查看文件 @bec57d0
@@ -279,7 +279,7 @@ class HtmlCollect extends Command
         foreach ($img as $vi) {
             $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vi && (!in_array($check_vi, $source))) {
-                $check_vi && $source[] = $check_vi;
+                $source[] = $check_vi;
             }
         }
@@ -289,7 +289,7 @@ class HtmlCollect extends Command
         foreach ($js as $vj) {
             $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vj && (!in_array($check_vj, $source))) {
-                $check_vj && $source[] = $check_vj;
+                $source[] = $check_vj;
             }
         }
@@ -299,7 +299,15 @@ class HtmlCollect extends Command
         foreach ($video as $vv) {
             $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vv && (!in_array($check_vv, $source))) {
-                $check_vv && $source[] = $check_vv;
+                $source[] = $check_vv;
+            }
+        }
+        preg_match_all('/<video\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_2);
+        $video_2 = $result_video_2[2] ?? [];
+        foreach ($video_2 as $vv2) {
+            $check_vv2 = $this->url_check($vv2, $project_id, $domain, $web_url_domain, $home_url);
+            if ($check_vv2 && (!in_array($check_vv2, $source))) {
+                $source[] = $check_vv2;
             }
         }
@@ -309,7 +317,7 @@ class HtmlCollect extends Command
         foreach ($css as $vc) {
             $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vc && (!in_array($check_vc, $source))) {
-                $check_vc && $source[] = $check_vc;
+                $source[] = $check_vc;
             }
         }
@@ -319,7 +327,7 @@ class HtmlCollect extends Command
         foreach ($css_b as $vc_b) {
             $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vc_b && (!in_array($check_vc_b, $source))) {
-                $check_vc_b && $source[] = $check_vc_b;
+                $source[] = $check_vc_b;
             }
         }
@@ -329,7 +337,7 @@ class HtmlCollect extends Command
         foreach ($down as $vd) {
             $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vd && (!in_array($check_vd, $source))) {
-                $check_vd && $source[] = $check_vd;
+                $source[] = $check_vd;
             }
         }
--- a/app/Console/Commands/Update/HtmlCustomCollect.php
查看文件 @bec57d0
+++ b/app/Console/Commands/Update/HtmlCustomCollect.php
查看文件 @bec57d0
@@ -282,7 +282,9 @@ class HtmlCustomCollect 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))) {
+                $source[] = $check_vi;
+            }
         }
         //js
@@ -290,7 +292,9 @@ class HtmlCustomCollect 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))) {
+                $source[] = $check_vj;
+            }
         }
         //video
@@ -298,7 +302,17 @@ class HtmlCustomCollect 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))) {
+                $source[] = $check_vv;
+            }
+        }
+        preg_match_all('/<video\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_2);
+        $video_2 = $result_video_2[2] ?? [];
+        foreach ($video_2 as $vv2) {
+            $check_vv2 = $this->url_check($vv2, $project_id, $domain, $web_url_domain, $home_url);
+            if ($check_vv2 && (!in_array($check_vv2, $source))) {
+                $source[] = $check_vv2;
+            }
         }
         //css
@@ -306,7 +320,9 @@ class HtmlCustomCollect 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))) {
+                $source[] = $check_vc;
+            }
         }
         //css background
@@ -314,7 +330,9 @@ class HtmlCustomCollect 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))) {
+                $source[] = $check_vc_b;
+            }
         }
         //a标签下载资源
@@ -322,7 +340,9 @@ class HtmlCustomCollect 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))) {
+                $source[] = $check_vd;
+            }
         }
         return $source;
--- a/app/Console/Commands/Update/HtmlLanguageCollect.php
查看文件 @bec57d0
+++ b/app/Console/Commands/Update/HtmlLanguageCollect.php
查看文件 @bec57d0
@@ -219,7 +219,7 @@ class HtmlLanguageCollect extends Command
         foreach ($img as $vi) {
             $check_vi = $this->url_check($vi, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vi && (!in_array($check_vi, $source))) {
-                $check_vi && $source[] = $check_vi;
+                $source[] = $check_vi;
             }
         }
@@ -229,7 +229,7 @@ class HtmlLanguageCollect extends Command
         foreach ($js as $vj) {
             $check_vj = $this->url_check($vj, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vj && (!in_array($check_vj, $source))) {
-                $check_vj && $source[] = $check_vj;
+                $source[] = $check_vj;
             }
         }
@@ -239,7 +239,15 @@ class HtmlLanguageCollect extends Command
         foreach ($video as $vv) {
             $check_vv = $this->url_check($vv, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vv && (!in_array($check_vv, $source))) {
-                $check_vv && $source[] = $check_vv;
+                $source[] = $check_vv;
+            }
+        }
+        preg_match_all('/<video\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $html, $result_video_2);
+        $video_2 = $result_video_2[2] ?? [];
+        foreach ($video_2 as $vv2) {
+            $check_vv2 = $this->url_check($vv2, $project_id, $domain, $web_url_domain, $home_url);
+            if ($check_vv2 && (!in_array($check_vv2, $source))) {
+                $source[] = $check_vv2;
             }
         }
@@ -249,7 +257,7 @@ class HtmlLanguageCollect extends Command
         foreach ($css as $vc) {
             $check_vc = $this->url_check($vc, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vc && (!in_array($check_vc, $source))) {
-                $check_vc && $source[] = $check_vc;
+                $source[] = $check_vc;
             }
         }
@@ -259,7 +267,7 @@ class HtmlLanguageCollect extends Command
         foreach ($css_b as $vc_b) {
             $check_vc_b = $this->url_check($vc_b, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vc_b && (!in_array($check_vc_b, $source))) {
-                $check_vc_b && $source[] = $check_vc_b;
+                $source[] = $check_vc_b;
             }
         }
@@ -269,7 +277,7 @@ class HtmlLanguageCollect extends Command
         foreach ($down as $vd) {
             $check_vd = $this->url_check($vd, $project_id, $domain, $web_url_domain, $home_url);
             if ($check_vd && (!in_array($check_vd, $source))) {
-                $check_vd && $source[] = $check_vd;
+                $source[] = $check_vd;
             }
         }
--- a/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @bec57d0
+++ b/app/Console/Commands/Update/ProjectUpdate.php
查看文件 @bec57d0
@@ -374,6 +374,8 @@ class ProjectUpdate extends Command
                                                         'values' => $ve,
                                                         'type' => 1
                                                     ]);
+                                                } else {
+                                                    $extend_info_model->edit(['values' => $ve], ['key' => $extend_key, 'product_id' => $id]);
                                                 }
                                             }
                                         }
@@ -464,10 +466,6 @@ class ProjectUpdate extends Command
                                                 'image' => $new_img,
                                                 'sort' => $item['sort'] ?? 0,
                                             ], ['id' => $id]);
-
-                                            if($project_id == 547){
-                                                CollectTask::_insert($item['url'], $project_id, $api_type == 'news' ? RouteMap::SOURCE_NEWS : RouteMap::SOURCE_BLOG, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
-                                            }
                                         }
                                     } catch (\Exception $e) {
                                         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
@@ -530,10 +528,6 @@ class ProjectUpdate extends Command
                                                 'description' => $item['description'] ?? '',
                                                 'html' => $item['content'] ?? '',
                                             ], ['id' => $id]);
-
-                                            if($project_id == 547){
-                                                CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_PAGE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
-                                            }
                                         }
                                     } catch (\Exception $e) {
                                         echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
@@ -593,7 +587,7 @@ class ProjectUpdate extends Command
                                                 $category_id = $category_custom['id'];
                                             }
                                         }
-                                        if($category_id){
+                                        if ($category_id) {
                                             $category_id = ',' . $category_id . ',';
                                         }
                                         //图片
@@ -633,10 +627,6 @@ class ProjectUpdate extends Command
                                                     'content' => $item['content'] ?? '',
                                                     'image' => $new_img
                                                 ], ['id' => $id]);
-
-                                                if($project_id == 547){
-                                                    CollectTask::_insert($item['url'], $project_id, RouteMap::SOURCE_MODULE, $id, $domain_arr['host'], $link_type, $language_list, $page_list);
-                                                }
                                             }
                                             //扩展字段