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

@@ -33,7 +33,7 @@ class AutoPullController extends BaseController
                     }
                     }
                 }
                 }
 
 
-                $lists['list'][$k]['process_name'] = $process_name;
+                $lists['list'][$k]['process_name'] = $process_name ? $process_name : ['无'];
             }
             }
         }
         }
 
 

@@ -322,6 +322,7 @@ class DomainInfoLogic extends BaseLogic
         $task_info = $task_model->read(['type'=>DomainCreateTask::TYPE_MAIN,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
         $task_info = $task_model->read(['type'=>DomainCreateTask::TYPE_MAIN,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
         if(!$task_info){
         if(!$task_info){
             $task_model->add([
             $task_model->add([
+                'server_id' => $serversIpInfo['servers_id'],
                 'project_id' => $info['project_id'],
                 'project_id' => $info['project_id'],
                 'domain_id' => $this->param['id'],
                 'domain_id' => $this->param['id'],
                 'type' => DomainCreateTask::TYPE_MAIN
                 'type' => DomainCreateTask::TYPE_MAIN
@@ -331,6 +332,7 @@ class DomainInfoLogic extends BaseLogic
             $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
             $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
             if(!$task_amp_info){
             if(!$task_amp_info){
                 $task_model->add([
                 $task_model->add([
+                    'server_id' => $serversIpInfo['servers_id'],
                     'project_id' => $info['project_id'],
                     'project_id' => $info['project_id'],
                     'domain_id' => $this->param['id'],
                     'domain_id' => $this->param['id'],
                     'type' => DomainCreateTask::TYPE_AMP
                     'type' => DomainCreateTask::TYPE_AMP
@@ -448,8 +450,19 @@ class DomainInfoLogic extends BaseLogic
         }
         }
 
 
         if($this->param['is_create']){
         if($this->param['is_create']){
-            //创建站点，设置证书
-            EditCustomDomainBt::dispatch($id);
+            $task_model = new DomainCreateTask();
+            $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_CUSTOM,'domain_id'=>$id,'status'=>['<',DomainCreateTask::STATUS_SUC]]);
+            if(!$task_amp_info){
+                $task_model->add([
+                    'server_id' => $serversIpInfo['servers_id'],
+                    'project_id' => $project_id,
+                    'domain_id' => $id,
+                    'type' => DomainCreateTask::TYPE_CUSTOM
+                ]);
+            }
+
+//            //创建站点，设置证书
+//            EditCustomDomainBt::dispatch($id);
         }
         }
 
 
         return $this->success();
         return $this->success();

@@ -15,4 +15,5 @@ class DomainCreateTask extends Base
 
 
     const TYPE_MAIN = 1;
     const TYPE_MAIN = 1;
     const TYPE_AMP = 2;
     const TYPE_AMP = 2;
+    const TYPE_CUSTOM = 3;
 }
 }