周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 dcee2c2206a2b4431ad6d22f843d138b853eb55f 1 个父辈 8fcd5c98

gx

内嵌 并排对比
正在显示 4 个修改的文件 包含 29 行增加 和 12 行删除
@@ -8,6 +8,7 @@ use App\Jobs\EditAmpDomainBt; @@ -8,6 +8,7 @@ use App\Jobs\EditAmpDomainBt;
8 use App\Jobs\EditCustomDomainBt; 8 use App\Jobs\EditCustomDomainBt;
9 use App\Jobs\EditDomainBt; 9 use App\Jobs\EditDomainBt;
10 use App\Models\Devops\ServerConfig; 10 use App\Models\Devops\ServerConfig;
  11 +use App\Models\Devops\Servers;
11 use App\Models\Devops\ServersIp; 12 use App\Models\Devops\ServersIp;
12 use App\Models\Domain\DomainInfo; 13 use App\Models\Domain\DomainInfo;
13 use App\Models\Project\CountryCustom; 14 use App\Models\Project\CountryCustom;
@@ -260,10 +261,13 @@ class DomainInfoLogic extends BaseLogic @@ -260,10 +261,13 @@ class DomainInfoLogic extends BaseLogic
260 $this->fail('获取项目数据失败'); 261 $this->fail('获取项目数据失败');
261 } 262 }
262 $serverIpModel = new ServersIp(); 263 $serverIpModel = new ServersIp();
263 - $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);  
264 - if($server_info === false){ 264 + $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
  265 + if($serversIpInfo === false){
265 $this->fail('获取服务器数据失败'); 266 $this->fail('获取服务器数据失败');
266 } 267 }
  268 + $serverModel = new Servers();
  269 + $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
  270 + $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
267 if($project_info['serve_id'] == 9){ 271 if($project_info['serve_id'] == 9){
268 $this->fail('请切换服务器,生成站点不能使用测试服务器'); 272 $this->fail('请切换服务器,生成站点不能使用测试服务器');
269 } 273 }
@@ -378,11 +382,13 @@ class DomainInfoLogic extends BaseLogic @@ -378,11 +382,13 @@ class DomainInfoLogic extends BaseLogic
378 if($this->param['is_create']){ 382 if($this->param['is_create']){
379 //需要创建站点 383 //需要创建站点
380 $serverIpModel = new ServersIp(); 384 $serverIpModel = new ServersIp();
381 - $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);  
382 - if($server_info === false){ 385 + $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
  386 + if($serversIpInfo === false){
383 $this->fail('获取服务器数据失败'); 387 $this->fail('获取服务器数据失败');
384 } 388 }
385 - 389 + $serverModel = new Servers();
  390 + $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
  391 + $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
386 //域名是否都已经解析 392 //域名是否都已经解析
387 if(strpos($this->param['custom_domain'],'//') === false){ 393 if(strpos($this->param['custom_domain'],'//') === false){
388 $this->param['custom_domain'] = '//'.$this->param['custom_domain']; 394 $this->param['custom_domain'] = '//'.$this->param['custom_domain'];
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Jobs; 3 namespace App\Jobs;
4 4
5 use App\Models\Devops\ServerConfig; 5 use App\Models\Devops\ServerConfig;
  6 +use App\Models\Devops\Servers;
6 use App\Models\Devops\ServersIp; 7 use App\Models\Devops\ServersIp;
7 use App\Models\Domain\DomainInfo; 8 use App\Models\Domain\DomainInfo;
8 use App\Models\Project\Project; 9 use App\Models\Project\Project;
@@ -54,10 +55,13 @@ class EditAmpDomainBt implements ShouldQueue @@ -54,10 +55,13 @@ class EditAmpDomainBt implements ShouldQueue
54 } 55 }
55 //获取服务器数据 56 //获取服务器数据
56 $serverIpModel = new ServersIp(); 57 $serverIpModel = new ServersIp();
57 - $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);  
58 - if ($server_info === false) { 58 + $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
  59 + if ($serversIpInfo === false) {
59 return $this->output($domain_info['domain'] . ':获取服务器数据失败'); 60 return $this->output($domain_info['domain'] . ':获取服务器数据失败');
60 } 61 }
  62 + $serverModel = new Servers();
  63 + $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
  64 + $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
61 //编辑amp站 65 //编辑amp站
62 $api_url_amp = 'http://' . $server_info['domain'] . '/api/createSiteAmp'; 66 $api_url_amp = 'http://' . $server_info['domain'] . '/api/createSiteAmp';
63 $api_param_amp = [ 67 $api_param_amp = [
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Jobs; 3 namespace App\Jobs;
4 4
5 use App\Models\Devops\ServerConfig; 5 use App\Models\Devops\ServerConfig;
  6 +use App\Models\Devops\Servers;
6 use App\Models\Devops\ServersIp; 7 use App\Models\Devops\ServersIp;
7 use App\Models\Project\CountryCustom; 8 use App\Models\Project\CountryCustom;
8 use App\Models\Project\Project; 9 use App\Models\Project\Project;
@@ -53,10 +54,13 @@ class EditCustomDomainBt implements ShouldQueue @@ -53,10 +54,13 @@ class EditCustomDomainBt implements ShouldQueue
53 } 54 }
54 //获取服务器数据 55 //获取服务器数据
55 $serverIpModel = new ServersIp(); 56 $serverIpModel = new ServersIp();
56 - $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);  
57 - if ($server_info === false) { 57 + $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
  58 + if ($serversIpInfo === false) {
58 return $this->output($domain_info['custom_domain'] . ':获取服务器数据失败'); 59 return $this->output($domain_info['custom_domain'] . ':获取服务器数据失败');
59 } 60 }
  61 + $serverModel = new Servers();
  62 + $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
  63 + $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
60 //编辑站点 64 //编辑站点
61 if ($domain_info['type'] == 2) { 65 if ($domain_info['type'] == 2) {
62 $api_url = 'http://' . $server_info['domain'] . '/api/setSsl'; 66 $api_url = 'http://' . $server_info['domain'] . '/api/setSsl';
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 namespace App\Jobs; 3 namespace App\Jobs;
4 4
5 use App\Models\Devops\ServerConfig; 5 use App\Models\Devops\ServerConfig;
  6 +use App\Models\Devops\Servers;
6 use App\Models\Devops\ServersIp; 7 use App\Models\Devops\ServersIp;
7 use App\Models\Domain\DomainInfo; 8 use App\Models\Domain\DomainInfo;
8 use App\Models\Project\Project; 9 use App\Models\Project\Project;
@@ -55,11 +56,13 @@ class EditDomainBt implements ShouldQueue @@ -55,11 +56,13 @@ class EditDomainBt implements ShouldQueue
55 56
56 //获取服务器数据 57 //获取服务器数据
57 $serverIpModel = new ServersIp(); 58 $serverIpModel = new ServersIp();
58 - $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);  
59 - if ($server_info === false) { 59 + $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
  60 + if ($serversIpInfo === false) {
60 return $this->output($domain_info['domain'] . ':获取服务器数据失败'); 61 return $this->output($domain_info['domain'] . ':获取服务器数据失败');
61 } 62 }
62 - 63 + $serverModel = new Servers();
  64 + $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
  65 + $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
63 //编辑主站 66 //编辑主站
64 if ($domain_info['type'] == 2) { 67 if ($domain_info['type'] == 2) {
65 $api_url = 'http://' . $server_info['domain'] . '/api/setSsl'; 68 $api_url = 'http://' . $server_info['domain'] . '/api/setSsl';