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

@@ -312,7 +312,7 @@ class AiBlogTask extends Command
             }else{
             }else{
                 $url = $domain.'api/update_page/?project_id='.$project_id.'&route=7';
                 $url = $domain.'api/update_page/?project_id='.$project_id.'&route=7';
                 $res = http_get($url);
                 $res = http_get($url);
-                echo '返回数据：'.json_encode($res,true).PHP_EOL;
+                echo '通知C端：'.json_encode($res,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES).PHP_EOL;
             }
             }
         }else{
         }else{
             echo '域名不存在：' . $project_id . PHP_EOL . date('Y-m-d H:i:s');
             echo '域名不存在：' . $project_id . PHP_EOL . date('Y-m-d H:i:s');

@@ -28,7 +28,7 @@ class RemainDay extends Command
      * @var 按上线时间统计
      * @var 按上线时间统计
      */
      */
     protected $projectId = [
     protected $projectId = [
-        1434,1812,276,2414
+        1434,1812,276,2414,2974
     ];//需要单独处理的项目
     ];//需要单独处理的项目
 
 
     /**
     /**

@@ -196,11 +196,11 @@ class VideoTask extends Command
     {
     {
 
 
         $keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)->whereNull('deleted_at')
         $keyword_id = Keyword::where('video', null)->whereIn("title", $keywords)->whereNull('deleted_at')
-            ->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->limit($number)->pluck('id')->toArray();
+            ->where('route', 'not like', '%-tag')->whereNotNull('keyword_content')->inRandomOrder()->take($number)->pluck('id')->toArray();
         $need = $number - count($keyword_id);
         $need = $number - count($keyword_id);
         if ($need > 0) {
         if ($need > 0) {
             $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNull('deleted_at')
             $keyword_arr_id = Keyword::where('video', null)->where('route', 'not like', '%-tag')->whereNull('deleted_at')
-                ->whereNotNull('keyword_content')->whereNotIn('id', $keyword_id)->orderBy('id','asc')->limit($need)->pluck('id')->toArray();
+                ->whereNotNull('keyword_content')->whereNotIn('id', $keyword_id)->orderBy('id','asc')->inRandomOrder()->take($need)->pluck('id')->toArray();
         }
         }
         $keyword_arr_id = array_merge($keyword_id, $keyword_arr_id);
         $keyword_arr_id = array_merge($keyword_id, $keyword_arr_id);
         $keyword = Keyword::whereIn("id", $keyword_arr_id)->get();
         $keyword = Keyword::whereIn("id", $keyword_arr_id)->get();

@@ -52,9 +52,9 @@ class LyhImportTest extends Command
      * @time   :2023/11/20 15:13
      * @time   :2023/11/20 15:13
      */
      */
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(2140);
+        ProjectServer::useProject(2878);
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
-        $this->import2140CustomModule('https://ecdn6.globalso.com/upload/p/2140/file/2025-03/2140.csv',2140);
+        $this->importProductCategory('https://ecdn6.globalso.com/upload/p/2878/file/2025-03/products.csv',2878);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
@@ -93,15 +93,15 @@ class LyhImportTest extends Command
                 continue;
                 continue;
             }
             }
             try {
             try {
-                $id = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$val[1],'seo_title'=>$val[0],'seo_des'=>$val[2],'sort'=>$val[3]]);
+                $id = $categoryModel->addReturnId(['project_id'=>$project_id,'title'=>$val[1],'seo_title'=>$val[0],'seo_des'=>$val[2]]);
                 $pid = 0;
                 $pid = 0;
-//                if($val[2] != 0){
-//                    //查询上级id
-//                    $pidCate = $categoryModel->read(['seo_title'=>$val[2]]);
-//                    if($pidCate !== false){
-//                        $pid = $pidCate['id'];
-//                    }
-//                }
+                if($val[2] != 0){
+                    //查询上级id
+                    $pidCate = $categoryModel->read(['seo_title'=>$val[2]]);
+                    if($pidCate !== false){
+                        $pid = $pidCate['id'];
+                    }
+                }
                 $route = RouteMap::setRoute($val[1],RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
                 $route = RouteMap::setRoute($val[1],RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
                 $categoryModel->edit(['route'=>$route,'pid'=>$pid],['id'=>$id]);
                 $categoryModel->edit(['route'=>$route,'pid'=>$pid],['id'=>$id]);
                 echo date('Y-m-d H:i:s') . '产品分类id：'. $id.PHP_EOL;
                 echo date('Y-m-d H:i:s') . '产品分类id：'. $id.PHP_EOL;

@@ -286,6 +286,10 @@ class DomainInfoLogic extends BaseLogic
                 'domain_id' => $this->param['id'],
                 'domain_id' => $this->param['id'],
                 'type' => DomainCreateTask::TYPE_MAIN
                 'type' => DomainCreateTask::TYPE_MAIN
             ]);
             ]);
+        }else{
+            if($task_info['status'] == DomainCreateTask::STATUS_UN){
+                $task_model->edit(['sort'=>0],['id'=>$task_info['id']]);
+            }
         }
         }
         if($data['amp_status']){
         if($data['amp_status']){
             $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
             $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);

@@ -490,7 +490,7 @@ class RankDataLogic extends BaseLogic
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $extension_project_ids = [354]; //扩展词也到达标的
         $compliance_project_ids = [2163,257,823]; //直接达标处理的
         $compliance_project_ids = [2163,257,823]; //直接达标处理的
-        $ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066,];//暂停项目id
+        $ceaseProjectId = [47, 354, 378, 649, 1226, 1283, 1703, 1893, 2066,2974];//暂停项目id
         //一个项目多个api_no
         //一个项目多个api_no
         $multiple_api_no_project_ids = [
         $multiple_api_no_project_ids = [
             2104 => [
             2104 => [