合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1168

@@ -52,7 +52,8 @@ class AiBlogTask extends Command
             $aiBlogService->key = $aiSettingInfo['key'];
             $aiBlogService->task_id = $info['task_id'];
             $result = $aiBlogService->getDetail();
-            if($result['status'] != 200){
+            echo '开始->任务id:' . json_encode($result) . PHP_EOL . date('Y-m-d H:i:s');
+            if(!isset($result['status']) || $result['status'] != 200){
                 sleep(10);
                 continue;
             }

@@ -14,6 +14,8 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Devops\ServersLogic;
 use App\Models\Devops\Servers as ServersModel;
 use App\Models\Devops\ServersIp;
+use App\Models\Domain\DomainInfo;
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 
 class ServersController extends BaseController
@@ -59,6 +61,22 @@ class ServersController extends BaseController
             }
             unset($this->map['project_name']);
         }
+        if(isset($this->map['domain']) && !empty($this->map['domain'])){
+            $domainModel = new DomainInfo();
+            $domainInfo = $domainModel->read(['domain'=>['like','%'.$this->map['domain'].'%']],['id','project_id']);
+            if($domainInfo !== false && !empty($domainInfo['project_id'])){
+                $projectModel = new Project();
+                $projectInfo = $projectModel->read(['id'=>$domainInfo['project_id']],['serve_id']);
+                if($projectInfo !== false){
+                    $serversIpModel = new ServersIp();
+                    $ipInfo = $serversIpModel->read(['id'=>$projectInfo['serve_id']],['servers_id']);
+                    if($ipInfo !== false){
+                        $this->map['id'] = $ipInfo['servers_id'];
+                    }
+                }
+            }
+            unset($this->map['domain']);
+        }
         $serversModel = new ServersModel();
         $data = $serversModel->lists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$data);