合并分支 'akun' 到 'master'

Akun



查看合并请求 !2005

@@ -159,7 +159,7 @@ class NoticeController extends BaseController
 
 
         //新增重定向任务
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
         $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){
         if(!$task_redirect_info){
             $redirect_model->add([
             $redirect_model->add([
                 'origin_domain'=> $origin_domain,
                 'origin_domain'=> $origin_domain,
@@ -167,7 +167,9 @@ class NoticeController extends BaseController
                 'target_domain' => $target_domain
                 'target_domain' => $target_domain
             ]);
             ]);
         }else{
         }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();
         return $this->success();

@@ -340,13 +340,17 @@ class DomainInfoLogic extends BaseLogic
         //新增重定向任务
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
         $redirect_model = new DomainRedirectTask();
         if($domain_301){
         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){
             if(!$task_redirect_info){
                 $redirect_model->add([
                 $redirect_model->add([
                     'origin_domain'=> $domain_301,
                     'origin_domain'=> $domain_301,
                     'other_domain' => json_encode([]),
                     'other_domain' => json_encode([]),
                     'target_domain' => $info['domain']
                     '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']]);
+                }
             }
             }
         }
         }