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

@@ -55,7 +55,7 @@ class VideoTask extends Command
     /**
     /**
      * @var int 最大子任务
      * @var int 最大子任务
      */
      */
-    public $max_sub_task = 800;
+    public $max_sub_task = 200;
 
 
     /**
     /**
      * @return bool
      * @return bool
@@ -189,23 +189,39 @@ class VideoTask extends Command
     }
     }
 
 
     /**
     /**
-     * @remark :根据关键字获取产品主图
-     * @name   :getKeywordList
-     * @author :lyh
-     * @method :post
-     * @time   :2024/2/23 16:28
+     * 根据关键字获取产品主图
+     * @param $keyword_id
+     * @param $project_id
+     * @param $domain
+     * @return array
      */
      */
     public function getKeywordImage($keyword_id,$project_id,$domain){
     public function getKeywordImage($keyword_id,$project_id,$domain){
         $keywordModel = new Keyword();
         $keywordModel = new Keyword();
         $keywordInfo = $keywordModel->read(['id'=>$keyword_id]);
         $keywordInfo = $keywordModel->read(['id'=>$keyword_id]);
+        // TODO 当内容太多时，生成视频过长， 尽量保证生成视频30秒左右， 所以需要控制文案内容长度
+        $content = $keywordInfo['keyword_content'];
+        $content_array = explode(" ", $content);
+        if (count($content_array) > 80) {
+            $content_array = preg_split("/[，,。]/u", $content);
+            $tmp = '';
+            foreach ($content_array as $val) {
+                $tmp .= $val . '.';
+                $tmp_array = explode(' ', $tmp);
+                if (count($tmp_array) > 60) {
+                    $content = $tmp;
+                    break;
+                }
+            }
+        }
+
         //TODO::所有产品
         //TODO::所有产品
         $thumb = $this->getRecommendAndHotProducts($keywordInfo['route'],$project_id);
         $thumb = $this->getRecommendAndHotProducts($keywordInfo['route'],$project_id);
-        $keyword_arr = Keyword::where("project_id",$project_id)->where("status",1)->inRandomOrder()->take(10)->pluck('title')->toArray();;
+        $keyword_arr = Keyword::where("project_id",$project_id)->where("status",1)->inRandomOrder()->take(10)->pluck('title')->toArray();
         $data = [
         $data = [
             'url'=>$domain.'/'.$keywordInfo['route'],
             'url'=>$domain.'/'.$keywordInfo['route'],
             'title'=>$keywordInfo['title'],
             'title'=>$keywordInfo['title'],
             'keyword_title'=>$keywordInfo['keyword_title'],
             'keyword_title'=>$keywordInfo['keyword_title'],
-            'keyword_content'=>$keywordInfo['keyword_content'],
+            'keyword_content'=>$content,
             'product_list'=>$thumb ?? [],
             'product_list'=>$thumb ?? [],
             'keyword_list'=>$keyword_arr ?? []
             'keyword_list'=>$keyword_arr ?? []
         ];
         ];
@@ -271,13 +287,13 @@ class VideoTask extends Command
     }
     }
 
 
     /**
     /**
-     * @remark :获取图片
-     * @name   :getImage
-     * @author :lyh
-     * @method :post
-     * @time   :2024/3/12 15:29
+     * 获取图片
+     * @param $domainInfo
+     * @return array
      */
      */
     public function getImage($domainInfo){
     public function getImage($domainInfo){
+        $logo = $bg = '';
+        try {
             $dom = file_get_html('https://'.$domainInfo['domain'].'/');
             $dom = file_get_html('https://'.$domainInfo['domain'].'/');
             $logoDom = $dom->find('.logo', 0)->find("img",0);
             $logoDom = $dom->find('.logo', 0)->find("img",0);
             if($logoDom != null){
             if($logoDom != null){
@@ -288,6 +304,9 @@ class VideoTask extends Command
                 $bg = $bgDom->src;
                 $bg = $bgDom->src;
             }
             }
             $dom->clear();
             $dom->clear();
-        return ['logo'=>$logo ?? '','bg'=>$bg ?? ''];
+        } catch (\Exception $e) {
+            Log::error('file_get_html: ' . $domainInfo['domain'] . ', error message: ' . $e->getMessage());
+        }
+        return ['logo' => $logo, 'bg' => $bg];
     }
     }
 }
 }

@@ -665,8 +665,6 @@ class ProjectUpdate extends Command
                                                 foreach ($item['extend'] as $ke => $ve) {
                                                 foreach ($item['extend'] as $ke => $ve) {
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     if ($extend) {
                                                     if ($extend) {
-                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
-                                                        if (!$extend_info) {
                                                         if ($extend['type'] == 3) {
                                                         if ($extend['type'] == 3) {
                                                             $gallery = [];
                                                             $gallery = [];
                                                             if (is_array($ve)) {
                                                             if (is_array($ve)) {
@@ -682,6 +680,9 @@ class ProjectUpdate extends Command
                                                         } else {
                                                         } else {
                                                             $value = $ve;
                                                             $value = $ve;
                                                         }
                                                         }
+
+                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
+                                                        if (!$extend_info) {
                                                             $extend_info_model->add([
                                                             $extend_info_model->add([
                                                                 'key' => $extend['key'],
                                                                 'key' => $extend['key'],
                                                                 'type' => $extend['type'],
                                                                 'type' => $extend['type'],
@@ -690,6 +691,8 @@ class ProjectUpdate extends Command
                                                                 'module_id' => $custom_info['id'],
                                                                 'module_id' => $custom_info['id'],
                                                                 'values' => $value,
                                                                 'values' => $value,
                                                             ]);
                                                             ]);
+                                                        } else {
+                                                            $extend_info_model->edit(['type' => $extend['type'], 'values' => $value], ['key' => $extend['key'], 'content_id' => $id]);
                                                         }
                                                         }
                                                     }
                                                     }
                                                 }
                                                 }