作者 刘锟

update

@@ -159,7 +159,7 @@ class NoticeController extends BaseController @@ -159,7 +159,7 @@ class NoticeController extends BaseController
159 159
160 //新增重定向任务 160 //新增重定向任务
161 $redirect_model = new DomainRedirectTask(); 161 $redirect_model = new DomainRedirectTask();
162 - $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id']); 162 + $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id','status']);
163 if(!$task_redirect_info){ 163 if(!$task_redirect_info){
164 $redirect_model->add([ 164 $redirect_model->add([
165 'origin_domain'=> $origin_domain, 165 'origin_domain'=> $origin_domain,
@@ -167,7 +167,9 @@ class NoticeController extends BaseController @@ -167,7 +167,9 @@ class NoticeController extends BaseController
167 'target_domain' => $target_domain 167 'target_domain' => $target_domain
168 ]); 168 ]);
169 }else{ 169 }else{
170 - $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN],['id'=>$task_redirect_info['id']]); 170 + if($task_redirect_info['status'] == DomainRedirectTask::STATUS_FAL){
  171 + $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN,'error_msg'=>null],['id'=>$task_redirect_info['id']]);
  172 + }
171 } 173 }
172 174
173 return $this->success(); 175 return $this->success();
@@ -340,13 +340,17 @@ class DomainInfoLogic extends BaseLogic @@ -340,13 +340,17 @@ class DomainInfoLogic extends BaseLogic
340 //新增重定向任务 340 //新增重定向任务
341 $redirect_model = new DomainRedirectTask(); 341 $redirect_model = new DomainRedirectTask();
342 if($domain_301){ 342 if($domain_301){
343 - $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301]); 343 + $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301],['id','status']);
344 if(!$task_redirect_info){ 344 if(!$task_redirect_info){
345 $redirect_model->add([ 345 $redirect_model->add([
346 'origin_domain'=> $domain_301, 346 'origin_domain'=> $domain_301,
347 'other_domain' => json_encode([]), 347 'other_domain' => json_encode([]),
348 'target_domain' => $info['domain'] 348 'target_domain' => $info['domain']
349 ]); 349 ]);
  350 + }else{
  351 + if($task_redirect_info['status'] == DomainRedirectTask::STATUS_FAL){
  352 + $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN,'error_msg'=>null],['id'=>$task_redirect_info['id']]);
  353 + }
350 } 354 }
351 } 355 }
352 356