合并分支 'akun' 到 'master'

Akun



查看合并请求 !2411

@@ -174,8 +174,8 @@ class NoticeController extends BaseController
                 'target_domain' => $target_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']]);
+            if($task_redirect_info['status'] > DomainRedirectTask::STATUS_ING){
+                $redirect_model->edit(['other_domain' => json_encode($other_domain), 'target_domain' => $target_domain, 'status'=>DomainRedirectTask::STATUS_UN, 'error_msg'=>null],['id'=>$task_redirect_info['id']]);
             }
         }