合并分支 'akun' 到 'master'

Akun



查看合并请求 !653

@@ -10,6 +10,7 @@
 namespace App\Console\Commands\Domain;
 
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Project\CountryCustom;
 use App\Models\Project\Project;
 use Illuminate\Console\Command;
@@ -98,7 +99,10 @@ class DomainInfo extends Command
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
 
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
-            if ($v['type'] == 1 && $ssl['to'] < $end_day && $project_info && $project_info['serve_id'] != ServerConfig::SELF_SITE_ID) {
+            if ($v['type'] == 1 && $ssl['to'] < $end_day && $project_info) {
+                $serverIpModel = new ServersIp();
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                     //非自建站项目，申请免费证书
                     $this->updatePrivate($v);
 
@@ -107,6 +111,8 @@ class DomainInfo extends Command
                     $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
                 }
 
+            }
+
             $domainModel->edit($data, ['id' => $v['id']]);
         }
     }
@@ -142,7 +148,10 @@ class DomainInfo extends Command
             $ssl['to'] && $data['amp_certificate_end_time'] = $ssl['to'];
 
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
-            if ($v['amp_type'] == 1 && $ssl['to'] < $end_day && $project_info && $project_info['serve_id'] != ServerConfig::SELF_SITE_ID) {
+            if ($v['amp_type'] == 1 && $ssl['to'] < $end_day && $project_info) {
+                $serverIpModel = new ServersIp();
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID) {
                     //非自建站项目，申请免费证书
                     $this->updateAmpPrivate($v['domain']);
 
@@ -150,6 +159,7 @@ class DomainInfo extends Command
                     $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
                     $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
                 }
+            }
 
             $domainModel->edit($data, ['id' => $v['id']]);
         }

@@ -268,10 +268,10 @@ class DomainInfoLogic extends BaseLogic
         $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){
+        if($serversIpInfo['servers_id'] == 7){
             $this->fail('请切换服务器,生成站点不能使用测试服务器');
         }
-        if($project_info['serve_id'] == ServerConfig::SELF_SITE_ID){
+        if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
             $this->model->edit(['amp_status' => $this->param['amp_status'] ?? 0,],['id'=>$this->param['id']]);
             $this->fail('自建站服务器无法生成站点');
         }
@@ -391,6 +391,12 @@ class DomainInfoLogic extends BaseLogic
             $serverModel = new Servers();
             $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
             $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
+            if($serversIpInfo['servers_id'] == 7){
+                $this->fail('请切换服务器,生成站点不能使用测试服务器');
+            }
+            if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
+                $this->fail('自建站服务器无法生成站点');
+            }
             //域名是否都已经解析
             if(strpos($this->param['custom_domain'],'//') === false){
                 $this->param['custom_domain'] = '//'.$this->param['custom_domain'];

@@ -8,6 +8,7 @@ use App\Exceptions\BsideGlobalException;
 use App\Http\Logic\Logic;
 use App\Models\Com\UpdateNotify;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteDelete;
 use App\Models\Service\Service;
@@ -175,11 +176,13 @@ class BaseLogic extends Logic
         $data['project_id'] = $this->user['project_id'];
         $str = http_build_query($data);
         $url = $this->user['domain'].'api/delHtml/?'.$str;
-        if(isset($this->project['serve_id']) && ($this->project['serve_id'] == ServerConfig::SELF_SITE_ID)){
+        $serverIpModel = new ServersIp();
+        $serversIpInfo = $serverIpModel->read(['id'=>$this->project['serve_id']],['servers_id']);
+        if($serversIpInfo && ($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID)){
             //自建站服务器直接返回
             return $this->success();
         }
-        if(isset($this->project['serve_id']) && ($this->project['serve_id'] != 1)){//TODO::当前项目通知不过 ，跳过自动更新
+        if($serversIpInfo && ($serversIpInfo['servers_id'] != 1)){//TODO::当前项目通知不过 ，跳过自动更新
             exec('curl -k "'.$url.'" > /dev/null 2>&1 &');
         }else{
             shell_exec('curl -k "'.$url.'"');