作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !1368
@@ -35,7 +35,7 @@ class Temp extends Command @@ -35,7 +35,7 @@ class Temp extends Command
35 35
36 public function handle() 36 public function handle()
37 { 37 {
38 - 38 + $this->domain_rewrite_https();
39 } 39 }
40 40
41 /** 41 /**
@@ -50,7 +50,7 @@ class Temp extends Command @@ -50,7 +50,7 @@ class Temp extends Command
50 $buildModel = new DeployBuild(); 50 $buildModel = new DeployBuild();
51 $serverIpModel = new ServersIp(); 51 $serverIpModel = new ServersIp();
52 $domainCreateTaskModel = new DomainCreateTask(); 52 $domainCreateTaskModel = new DomainCreateTask();
53 - $list = $domainModel->select(['id', 'domain', 'project_id'])->where('status', '=', 1)->where('project_id', '>', 0)->get(); 53 + $list = $domainModel->select(['id', 'domain', 'project_id'])->where('status', '=', 1)->where('project_id', '>', 0)->where('is_https', 0)->get();
54 foreach ($list as $v) { 54 foreach ($list as $v) {
55 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']); 55 $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
56 if (!$project_info) { 56 if (!$project_info) {