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

@@ -771,7 +771,7 @@ class RelayInquiry extends Command
      */
     public function getInquiry($num = 10)
     {
-        $result = ReInquiryForm::where(['status' => ReInquiryForm::STATUS_INIT])->where('created_at', '>', '2025-04-27 00:00:00')->orderBy('id', 'asc')->limit($num)->get();
+        $result = ReInquiryForm::where(['status' => ReInquiryForm::STATUS_INIT])->where('created_at', '>', '2025-05-22 18:00:00')->orderBy('id', 'asc')->limit($num)->get();
         return $result;
     }
 

@@ -159,7 +159,7 @@ class NoticeController extends BaseController
 
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
-        $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id']);
+        $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id','status']);
         if(!$task_redirect_info){
             $redirect_model->add([
                 'origin_domain'=> $origin_domain,
@@ -167,7 +167,9 @@ class NoticeController extends BaseController
                 'target_domain' => $target_domain
             ]);
         }else{
-            $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN],['id'=>$task_redirect_info['id']]);
+            if($task_redirect_info['status'] == DomainRedirectTask::STATUS_FAL){
+                $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN,'error_msg'=>null],['id'=>$task_redirect_info['id']]);
+            }
         }
 
         return $this->success();

@@ -291,7 +291,7 @@ class OptimizationReportController extends BaseController
         //复制站点域名
         $ext_projects = $this->getExtendProjects();
         $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
-        $ext_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? '');//关联域名
+        $ext_domain = explode(',', str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? ''));//关联域名
         //关联域名
         $relate_domain = str_replace('www.', '', InquiryRelateDomain::getRelateDomain($domain, 'globalso_domain'));
         //AI站点域名
@@ -316,11 +316,11 @@ class OptimizationReportController extends BaseController
                 $domain_text = 'AI域名：' . $last['r'];
                 if (in_array($flg_ext, [1, 2]) || $flg_ai == 1) {
                     if ($last['r'] == $ai_domain) {
-                        $domain_text = '星链域名：' . $ai_domain;
-                    } else if ($last['r'] == $ext_domain) {
-                        $domain_text = '主域名2：' . $ext_domain;
+                        $domain_text = '星链域名：' . $last['r'];
+                    } else if (in_array($last['r'], $ext_domain)) {
+                        $domain_text = '主域名2：' . $last['r'];
                     } else if ($last['r'] == $relate_domain) {
-                        $domain_text = '主域名2：' . $relate_domain;
+                        $domain_text = '主域名2：' . $last['r'];
                     } else {
                         $domain_text = 'AI域名：' . $last['r'];
                     }

@@ -340,13 +340,17 @@ class DomainInfoLogic extends BaseLogic
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
         if($domain_301){
-            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301]);
+            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301],['id','status']);
             if(!$task_redirect_info){
                 $redirect_model->add([
                     'origin_domain'=> $domain_301,
                     'other_domain' => json_encode([]),
                     'target_domain' => $info['domain']
                 ]);
+            }else{
+                if($task_redirect_info['status'] == DomainRedirectTask::STATUS_FAL){
+                    $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN,'error_msg'=>null],['id'=>$task_redirect_info['id']]);
+                }
             }
         }
 

@@ -235,7 +235,7 @@ class RankDataLogic extends BaseLogic
         //复制站点域名
         $ext_projects = $this->getExtendProjects();
         $flg_ext = $this->getExtFlag($ext_projects, $domain, $api_no);
-        $ext_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? '');
+        $ext_domain = explode(',', str_replace('www.', '', $this->getExtendProjects($api_no)['ext'] ?? ''));//关联域名
         $main_domain = str_replace('www.', '', $this->getExtendProjects($api_no)['url'] ?? '');
         //关联域名
         $relate_domain = str_replace('www.', '', InquiryRelateDomain::getRelateDomain($domain, 'globalso_domain'));
@@ -266,11 +266,11 @@ class RankDataLogic extends BaseLogic
                 $domain_text = 'AI域名：' . $last['r'];
                 if (in_array($flg_ext, [1, 2]) || $flg_ai == 1) {
                     if ($last['r'] == $ai_domain) {
-                        $domain_text = '星链域名：' . $ai_domain;
-                    } else if ($last['r'] == $ext_domain) {
-                        $domain_text = '主域名2：' . $ext_domain;
+                        $domain_text = '星链域名：' . $last['r'];
+                    } else if (in_array($last['r'], $ext_domain)) {
+                        $domain_text = '主域名2：' . $last['r'];
                     } else if ($last['r'] == $relate_domain) {
-                        $domain_text = '主域名2：' . $relate_domain;
+                        $domain_text = '主域名2：' . $last['r'];
                     } else {
                         $domain_text = 'AI域名：' . $last['r'];
                     }