gx

@@ -8,6 +8,7 @@ use App\Jobs\EditAmpDomainBt;
 use App\Jobs\EditCustomDomainBt;
 use App\Jobs\EditDomainBt;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\CountryCustom;
@@ -260,10 +261,13 @@ class DomainInfoLogic extends BaseLogic
             $this->fail('获取项目数据失败');
         }
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if($server_info === false){
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if($serversIpInfo === false){
             $this->fail('获取服务器数据失败');
         }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         if($project_info['serve_id'] == 9){
             $this->fail('请切换服务器,生成站点不能使用测试服务器');
         }
@@ -378,11 +382,13 @@ class DomainInfoLogic extends BaseLogic
         if($this->param['is_create']){
             //需要创建站点
             $serverIpModel = new ServersIp();
-            $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-            if($server_info === false){
+            $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+            if($serversIpInfo === false){
                 $this->fail('获取服务器数据失败');
             }
-
+            $serverModel = new Servers();
+            $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+            $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
             //域名是否都已经解析
             if(strpos($this->param['custom_domain'],'//') === false){
                 $this->param['custom_domain'] = '//'.$this->param['custom_domain'];

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
@@ -54,10 +55,13 @@ class EditAmpDomainBt implements ShouldQueue
         }
         //获取服务器数据
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if ($server_info === false) {
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if ($serversIpInfo === false) {
             return $this->output($domain_info['domain'] . ':获取服务器数据失败');
         }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         //编辑amp站
         $api_url_amp = 'http://' . $server_info['domain'] . '/api/createSiteAmp';
         $api_param_amp = [

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Project\CountryCustom;
 use App\Models\Project\Project;
@@ -53,10 +54,13 @@ class EditCustomDomainBt implements ShouldQueue
         }
         //获取服务器数据
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if ($server_info === false) {
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if ($serversIpInfo === false) {
             return $this->output($domain_info['custom_domain'] . ':获取服务器数据失败');
         }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         //编辑站点
         if ($domain_info['type'] == 2) {
             $api_url = 'http://' . $server_info['domain'] . '/api/setSsl';

@@ -3,6 +3,7 @@
 namespace App\Jobs;
 
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
@@ -55,11 +56,13 @@ class EditDomainBt implements ShouldQueue
 
         //获取服务器数据
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if ($server_info === false) {
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if ($serversIpInfo === false) {
             return $this->output($domain_info['domain'] . ':获取服务器数据失败');
         }
-
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         //编辑主站
         if ($domain_info['type'] == 2) {
             $api_url = 'http://' . $server_info['domain'] . '/api/setSsl';