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

@@ -10,6 +10,7 @@ use App\Models\Product\Keyword;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\KeywordRelated;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\SyncSubmitTask\SyncSubmitTask;
 use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebLanguage;
 use App\Services\BatchExportService;
 use App\Services\BatchExportService;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
@@ -33,7 +34,27 @@ class Temp extends Command
 
 
     public function handle()
     public function handle()
     {
     {
-        $this->create_all_amp_notify();
+        $this->check_m_visit();
+    }
+
+    public function check_m_visit()
+    {
+        $list = SyncSubmitTask::where('project_id', 0)->where('data', 'like', '%m.m.%')->limit(5000)->get();
+        foreach ($list as $item){
+            dump($item->id);
+            $data = $item->data;
+            $item_data = $data['data'];
+            $item_data = str_replace('m.m.', 'm.',$item_data);
+            $data['data'] = $item_data;
+            $data = str_replace('m.m.', 'm.', $data);
+            $item->data = $data;
+            $item->status = 0;
+            $item->retry = 0;
+            $item->remark = '';
+            $item->save();
+        }
+
+        $this->output('success');
     }
     }
 
 
     /**
     /**

@@ -213,6 +213,7 @@ class RankDataLogic extends BaseLogic
         $ext_projects = $this->getExtendProjects();
         $ext_projects = $this->getExtendProjects();
         $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
         $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
         $ext_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? '');
         $ext_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? '');
+        $main_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['url'] ?? '');
         //AI站点域名
         //AI站点域名
         $ai_projects = $this->getAiProjects()['data'] ?? [];
         $ai_projects = $this->getAiProjects()['data'] ?? [];
         $flg_ai = $this->getAiFlag($ai_projects, $domain);
         $flg_ai = $this->getAiFlag($ai_projects, $domain);
@@ -243,6 +244,12 @@ class RankDataLogic extends BaseLogic
                     }
                     }
                 }
                 }
             }
             }
+            //当前站是复制站，显示主站的域名
+            if($flg_ext == 2 && empty($last['r'])){
+                $domain = $main_domain;
+                $domain_text = '主域名：' . $main_domain;
+            }
+
             $domain_arr = explode('：', $domain_text);
             $domain_arr = explode('：', $domain_text);
             $v = [
             $v = [
                 'keyword' => $key,
                 'keyword' => $key,