合并分支 'akun' 到 'master'

Akun 查看合并请求 !683

合并分支 'akun' 到 'master'
Akun 查看合并请求 !683
刘锟
app/Console/Commands/Domain/DomainInfo.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @448a632
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @448a632
@@ -15,6 +15,7 @@ use App\Models\Project\CountryCustom;
 use App\Models\Project\Project;
 use Illuminate\Console\Command;
 use App\Models\Domain\DomainInfo as DomainInfoModel;
+use Symfony\Component\Process\Process;
 class DomainInfo extends Command
 {
@@ -86,6 +87,7 @@ class DomainInfo extends Command
     {
         $domainModel = new DomainInfoModel();
         $projectModel = new Project();
+        $serverIpModel = new ServersIp();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $domainModel->where('status', '=', 1)->where(function ($query) use ($end_day) {
             $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
@@ -100,9 +102,8 @@ class DomainInfo extends Command
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_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) {
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id', 'ip', 'domain']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID && $this->check_cname($v['domain'], $servers_ip_info)) {
                     //非自建站项目，申请免费证书
                     $this->updatePrivate($v);
@@ -126,6 +127,7 @@ class DomainInfo extends Command
     {
         $domainModel = new DomainInfoModel();
         $projectModel = new Project();
+        $serverIpModel = new ServersIp();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $domainModel->where('status', '=', 1)->where('amp_status', 1)->where(function ($query) use ($end_day) {
             $query->whereNull('amp_certificate_end_time')->orWhere('amp_certificate_end_time', '<', $end_day);
@@ -149,15 +151,14 @@ class DomainInfo extends Command
             $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_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) {
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id', 'ip', 'domain']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID && $this->check_cname($amp_domain, $servers_ip_info)) {
                     //非自建站项目，申请免费证书
                     $this->updateAmpPrivate($v);
-                    $ssl_new = $this->updateDomainSsl($v['domain']);
-                    $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
-                    $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
+                    $ssl_new = $this->updateDomainSsl($amp_domain);
+                    $ssl_new['from'] && $data['amp_certificate_start_time'] = $ssl_new['from'];
+                    $ssl_new['to'] && $data['amp_certificate_end_time'] = $ssl_new['to'];
                 }
             }
@@ -173,6 +174,8 @@ class DomainInfo extends Command
     public function startUpdateCustomCert()
     {
         $customModel = new CountryCustom();
+        $projectModel = new Project();
+        $serverIpModel = new ServersIp();
         $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $customModel->where('status', 1)->where('is_create', 1)->where(function ($query) use ($end_day) {
             $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
@@ -184,13 +187,17 @@ class DomainInfo extends Command
             $ssl['from'] && $data['certificate_start_time'] = $ssl['from'];
             $ssl['to'] && $data['certificate_end_time'] = $ssl['to'];
-            if ($v['type'] == 1 && $ssl['to'] < $end_day) {
-                //申请免费证书
-                $this->updateCustomPrivate($v['custom_domain']);
+            $project_info = $projectModel->read(['id' => $v['project_id']], ['serve_id']);
+            if ($v['type'] == 1 && $ssl['to'] < $end_day && $project_info) {
+                $servers_ip_info = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id', 'ip', 'domain']);
+                if ($servers_ip_info && $servers_ip_info['servers_id'] != ServerConfig::SELF_SITE_ID && $this->check_cname($v['custom_domain'], $servers_ip_info)) {
+                    //申请免费证书
+                    $this->updateCustomPrivate($v['custom_domain']);
-                $ssl_new = $this->updateDomainSsl($v['domain']);
-                $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
-                $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
+                    $ssl_new = $this->updateDomainSsl($v['domain']);
+                    $ssl_new['from'] && $data['certificate_start_time'] = $ssl_new['from'];
+                    $ssl_new['to'] && $data['certificate_end_time'] = $ssl_new['to'];
+                }
             }
             $customModel->edit($data, ['id' => $v['id']]);
@@ -336,4 +343,41 @@ class DomainInfo extends Command
         }
         return ['start' => $start, 'end' => $end];
     }
+
+    /**
+     * 验证是否cname或者A记录解析到目标服务器
+     * @param $domain
+     * @param $server_info
+     * @return mixed
+     * @author zbj
+     * @date 2023/11/13
+     */
+    public function check_cname($domain, $server_info)
+    {
+        $process = new Process(['nslookup', '-qt=a', $domain]);
+        $process->run();
+        $output = explode(PHP_EOL, $process->getOutput());
+        foreach ($output as $line) {
+            if ($line) {
+                $checkA = strpos($line, $server_info['ip']) !== false;
+                if ($checkA) {
+                    return $domain;
+                }
+            }
+        }
+
+        //是否cname
+        $process = new Process(['nslookup', '-qt=cname', $domain]);
+        $process->run();
+        $output = explode(PHP_EOL, $process->getOutput());
+        foreach ($output as $line) {
+            if ($line) {
+                $checkCname = (strpos($line, $server_info['domain']) !== false);
+                if ($checkCname) {
+                    return $domain;
+                }
+            }
+        }
+        return false;
+    }
 }