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

+<?php
+
+namespace App\Console\Commands\Domain;
+
+use App\Models\Devops\Servers;
+use App\Models\Devops\ServersIp;
+use App\Models\Domain\DomainCreateTask;
+use App\Models\Domain\DomainInfo;
+use App\Models\Project\Project;
+use App\Utils\HttpUtils;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Console\Command;
+
+class CreateSite extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'create_domain_site';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '创建域名站点';
+
+    public function handle()
+    {
+        $model = new DomainCreateTask();
+
+        $task = $model->read(['status' => DomainCreateTask::STATUS_UN]);
+        if ($task) {
+            $model->edit(['status' => DomainCreateTask::STATUS_ING], ['id' => $task['id']]);
+
+            $re = $this->editDomainBt($task['domain_id']);
+
+            if (is_array($re)) {
+                $model->edit(['status' => DomainCreateTask::STATUS_FAL, 'error_msg' => $re[1]], ['id' => $task['id']]);
+            } else {
+                $model->edit(['status' => DomainCreateTask::STATUS_SUC], ['id' => $task['id']]);
+            }
+        }
+    }
+
+    protected function editDomainBt($domain_id)
+    {
+        //获取域名数据
+        $domain_model = new DomainInfo();
+        $domain_info = $domain_model->read(['id' => $domain_id]);
+        if ($domain_info === false) {
+            return [false, '获取域名数据失败'];
+        }
+
+        //获取项目数据
+        $project_model = new Project();
+        $project_info = $project_model->read(['id' => $domain_info['project_id']], 'serve_id');
+        if ($project_info === false) {
+            return [false, '获取项目数据失败'];
+        }
+
+        //获取服务器数据
+        $serverIpModel = new ServersIp();
+        $serversIpInfo = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id']);
+        if ($serversIpInfo === false) {
+            return [false, '获取服务器数据失败1'];
+        }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id' => $serversIpInfo['servers_id']], ['init_domain']);
+        if ($serverInfo === false) {
+            return [false, '获取服务器数据失败2'];
+        }
+
+        /*****************编辑主站*******************/
+        if ($domain_info['type'] == 2) {
+            $api_url = 'http://' . $serverInfo['init_domain'] . '/api/setSsl';
+            $api_param = [
+                'domain' => $domain_info['domain'],
+                'private_key' => $domain_info['private_key'],
+                'cert' => $domain_info['private_cert'],
+                'rewrite' => $domain_info['extend_config'],
+                'other_domain' => $domain_info['other_domain'],
+                'is_https' => $domain_info['is_https'],
+                'not_allow_country' => $domain_info['not_allow_country'],
+                'not_allow_ip' => $domain_info['not_allow_ip'],
+                'is_redirect' => $domain_info['is_redirect']
+            ];
+        } else {
+            $api_url = 'http://' . $serverInfo['init_domain'] . '/api/applySsl';
+            $api_param = [
+                'domain' => $domain_info['domain'],
+                'rewrite' => $domain_info['extend_config'],
+                'other_domain' => $domain_info['other_domain'],
+                'is_https' => $domain_info['is_https'],
+                'not_allow_country' => $domain_info['not_allow_country'],
+                'not_allow_ip' => $domain_info['not_allow_ip'],
+                'is_redirect' => $domain_info['is_redirect']
+            ];
+        }
+
+        try {
+            $rs = HttpUtils::get($api_url, $api_param);
+            $rs = json_decode($rs, true);
+            if (isset($rs['status']) && $rs['status'] == 200) {
+                $this->output($domain_info['domain'] . ',主站创建成功');
+            } else {
+                return [false, '主站:' . ($rs['message'] ?? '未知错误')];
+            }
+        } catch (\Exception | GuzzleException $e) {
+            return [false, '主站:' . $e->getMessage()];
+        }
+
+        /*****************编辑amp站*******************/
+        if ($domain_info['amp_status']) {
+            $api_url_amp = 'http://' . $serverInfo['init_domain'] . '/api/createSiteAmp';
+            $api_param_amp = [
+                'domain' => $domain_info['domain'],
+                'not_allow_country' => $domain_info['not_allow_country'],
+                'not_allow_ip' => $domain_info['not_allow_ip'],
+                'is_redirect' => $domain_info['is_redirect']
+            ];
+            if ($domain_info['amp_type'] == 2) {
+                $api_param_amp['private_key'] = $domain_info['amp_private_key'];
+                $api_param_amp['cert'] = $domain_info['amp_private_cert'];
+            }
+
+            try {
+                $rs_amp = HttpUtils::get($api_url_amp, $api_param_amp);
+                $rs_amp = json_decode($rs_amp, true);
+                if (isset($rs_amp['status']) && $rs_amp['status'] == 200) {
+                    $this->output($domain_info['domain'] . ',amp站创建成功');
+                } else {
+                    return [false, 'amp站:' . ($rs['message'] ?? '未知错误')];
+                }
+            } catch (\Exception | GuzzleException $e_amp) {
+                return [false, 'amp站:' . $e_amp->getMessage()];
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 输出处理日志
+     * @param $message
+     */
+    public function output($message)
+    {
+        echo date('Y-m-d H:i:s') . ' | ' . $message . PHP_EOL;
+    }
+}

@@ -317,7 +317,7 @@ class DomainInfoLogic extends BaseLogic
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);
 
 
-        //新站建站任务
+        //新增建站任务
         $task_model = new DomainCreateTask();
         $task_model = new DomainCreateTask();
         $task_info = $task_model->read(['domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
         $task_info = $task_model->read(['domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
         if(!$task_info){
         if(!$task_info){
@@ -326,12 +326,12 @@ class DomainInfoLogic extends BaseLogic
                 'domain_id' => $this->param['id']
                 'domain_id' => $this->param['id']
             ]);
             ]);
         }
         }
-        //主站生成证书
-        EditDomainBt::dispatch($this->param['id']);
-        //amp站生成证书
-        if($data['amp_status']){
-            EditAmpDomainBt::dispatch($this->param['id']);
-        }
+//        //主站生成证书
+//        EditDomainBt::dispatch($this->param['id']);
+//        //amp站生成证书
+//        if($data['amp_status']){
+//            EditAmpDomainBt::dispatch($this->param['id']);
+//        }
         return $this->success();
         return $this->success();
     }
     }