作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !2000
@@ -159,13 +159,15 @@ class NoticeController extends BaseController @@ -159,13 +159,15 @@ 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]); 162 + $task_redirect_info = $redirect_model->read(['origin_domain'=>$origin_domain],['id']);
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,
166 'other_domain' => json_encode($other_domain), 166 'other_domain' => json_encode($other_domain),
167 'target_domain' => $target_domain 167 'target_domain' => $target_domain
168 ]); 168 ]);
  169 + }else{
  170 + $redirect_model->edit(['status'=>DomainRedirectTask::STATUS_UN],['id'=>$task_redirect_info['id']]);
169 } 171 }
170 172
171 return $this->success(); 173 return $this->success();