合并分支 'akun' 到 'master'

Akun



查看合并请求 !399

@@ -237,7 +237,7 @@ class SyncProject extends Command
                     array_push($param['api_type'],'category_news');
                     array_push($param['api_type'],'category_news');
                 }
                 }
                 foreach ($param['api_type'] as $v_type){
                 foreach ($param['api_type'] as $v_type){
-                    if($v_type == 'category' || $v_type == 'category_news'){
+                    if($v_type == 'category' || $v_type == 'category_news' || $v_type == 'tag'){
                         UpdateLog::createLog($id,$v_type,$param['get_data_url']);
                         UpdateLog::createLog($id,$v_type,$param['get_data_url']);
                     }else{
                     }else{
                         $task_list[] = $v_type;
                         $task_list[] = $v_type;

@@ -276,6 +276,7 @@ class ProjectUpdate extends Command
 
 
                             $model = new Product();
                             $model = new Product();
                             $category_model = new Category();
                             $category_model = new Category();
+                            $keyword_model = new Keyword();
                             $extend_model = new Extend();
                             $extend_model = new Extend();
                             $extend_info_model = new ExtendInfo();
                             $extend_info_model = new ExtendInfo();
                             $logic = new CategoryLogic();
                             $logic = new CategoryLogic();
@@ -297,6 +298,12 @@ class ProjectUpdate extends Command
                                         $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]);
                                         $category_arr = $category_model->list(['original_id' => ['in', array_column($item['category'], 'id')]]);
                                         $category_id = $logic->getLastCategory(array_column($category_arr, 'id'));
                                         $category_id = $logic->getLastCategory(array_column($category_arr, 'id'));
                                     }
                                     }
+                                    //关键词
+                                    $keyword_id = '';
+                                    if ($item['tags'] ?? []) {
+                                        $keyword_arr = $keyword_model->list(['title' => ['in', array_column($item['tags'], 'name')]]);
+                                        $keyword_id = array_column($keyword_arr,'id');
+                                    }
                                     //名称去掉特殊符号
                                     //名称去掉特殊符号
                                     $item['ttile'] = $this->special2str($item['ttile'] ?? '');
                                     $item['ttile'] = $this->special2str($item['ttile'] ?? '');
 
 
@@ -309,6 +316,7 @@ class ProjectUpdate extends Command
                                                 'intro' => $item['short_description'] ?? '',
                                                 'intro' => $item['short_description'] ?? '',
                                                 'content' => $item['content'] ?? '',
                                                 'content' => $item['content'] ?? '',
                                                 'category_id' => $category_id,
                                                 'category_id' => $category_id,
+                                                'keyword_id' => $keyword_id,
                                                 'thumb' => isset($gallery[0]) ? Arr::a2s($gallery[0]) : '',
                                                 'thumb' => isset($gallery[0]) ? Arr::a2s($gallery[0]) : '',
                                                 'gallery' => Arr::a2s($gallery),
                                                 'gallery' => Arr::a2s($gallery),
                                                 'seo_mate' => Arr::a2s([
                                                 'seo_mate' => Arr::a2s([
@@ -333,6 +341,7 @@ class ProjectUpdate extends Command
                                                 'intro' => $item['short_description'] ?? '',
                                                 'intro' => $item['short_description'] ?? '',
                                                 'content' => $item['content'] ?? '',
                                                 'content' => $item['content'] ?? '',
                                                 'category_id' => $category_id,
                                                 'category_id' => $category_id,
+                                                'keyword_id' => $keyword_id,
                                                 'thumb' => isset($gallery[0]) ? Arr::a2s($gallery[0]) : '',
                                                 'thumb' => isset($gallery[0]) ? Arr::a2s($gallery[0]) : '',
                                                 'gallery' => Arr::a2s($gallery),
                                                 'gallery' => Arr::a2s($gallery),
                                                 'seo_mate' => Arr::a2s([
                                                 'seo_mate' => Arr::a2s([

@@ -33,7 +33,7 @@ class UpdateLog extends Model
             $log->project_id = $project_id;
             $log->project_id = $project_id;
             $log->api_type = $type;
             $log->api_type = $type;
             $log->api_url = $url;
             $log->api_url = $url;
-            $log->sort = ($type == 'category' || $type == 'category_news') ? 0 : 1;
+            $log->sort = ($type == 'category' || $type == 'category_news' || $type == 'tag') ? 0 : 1;
             $log->collect_status = ($type == 'category' || $type == 'category_news' || $type == 'website_info' || $type == 'tag') ? 1 : 0;
             $log->collect_status = ($type == 'category' || $type == 'category_news' || $type == 'website_info' || $type == 'tag') ? 1 : 0;
             return $log->save();
             return $log->save();
         }
         }