Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -55,21 +55,21 @@ class QuanqiusouApi
      * @date 2023/5/11
      * @date 2023/5/11
      */
      */
     public function getSiteResPer($api_no){
     public function getSiteResPer($api_no){
-        $key = 'quanqiusou_api_site_res_per_' . $api_no . '_' . date('Y-m-d');
-        $res = Cache::get($key);
-        if (!$res) {
+//        $key = 'quanqiusou_api_site_res_per_' . $api_no . '_' . date('Y-m-d');
+//        $res = Cache::get($key);
+//        if (!$res) {
             $api_url = $this->url . '/google-rank/echo_site_res_per.php';
             $api_url = $this->url . '/google-rank/echo_site_res_per.php';
             try {
             try {
                 $res = HttpUtils::get($api_url, ['apino' => $api_no]);
                 $res = HttpUtils::get($api_url, ['apino' => $api_no]);
                 if($res){
                 if($res){
                     $res = Arr::s2a($res);
                     $res = Arr::s2a($res);
-                    Cache::put($key, $res, 2 * 3600);
+//                    Cache::put($key, $res, 2 * 3600);
                 }
                 }
             } catch (\Exception | GuzzleException $e) {
             } catch (\Exception | GuzzleException $e) {
                 errorLog('获取站点收录页面数', [], $e);
                 errorLog('获取站点收录页面数', [], $e);
                 return false;
                 return false;
             }
             }
-        }
+//        }
         return $res;
         return $res;
     }
     }
 
 

@@ -3,11 +3,13 @@
 namespace App\Http\Logic\Aside\Domain;
 namespace App\Http\Logic\Aside\Domain;
 
 
 
 
+use App\Helper\Arr;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServersIp;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Domain\DomainRedirectTask;
 use App\Models\Project\CountryCustom;
 use App\Models\Project\CountryCustom;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use Symfony\Component\Process\Process;
 use Symfony\Component\Process\Process;
@@ -151,7 +153,7 @@ class DomainInfoLogic extends BaseLogic
      */
      */
     public function sslSave(){
     public function sslSave(){
         $info = $this->model->read(['id'=>$this->param['id']]);
         $info = $this->model->read(['id'=>$this->param['id']]);
-        if($info === false){
+        if($info === false || empty($info['domain'])){
             $this->fail('当前数据不存在或者已被删除');
             $this->fail('当前数据不存在或者已被删除');
         }
         }
         //获取项目数据
         //获取项目数据
@@ -173,12 +175,19 @@ class DomainInfoLogic extends BaseLogic
             $this->fail('自建站服务器无法生成站点');
             $this->fail('自建站服务器无法生成站点');
         }
         }
         //域名是否都已经解析
         //域名是否都已经解析
-        if(!empty($info['domain']) && !$this->check_cname($info['domain'], $serversIpInfo)){
+        if(!$this->check_cname($info['domain'], $serversIpInfo)){
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
         }
         }
+        $domain_301 = [];
         foreach ($this->param['other_domain']??[] as $other_domain){
         foreach ($this->param['other_domain']??[] as $other_domain){
-            if($other_domain && !$this->check_cname($other_domain, $serversIpInfo)){
-                $this->fail('域名' . $other_domain . '未解析至目标服务器');
+            if($other_domain && substr($other_domain,0,2) != '*.'){
+                if($this->check_a($other_domain,DomainInfo::SERVER_IP_301)){
+                    $domain_301[] = $other_domain;
+                }else{
+                    if(!$this->check_cname($other_domain, $serversIpInfo)){
+                        $this->fail('域名' . $other_domain . '未解析至目标服务器');
+                    }
+                }
             }
             }
         }
         }
 
 
@@ -261,6 +270,19 @@ class DomainInfoLogic extends BaseLogic
             }
             }
         }
         }
 
 
+        //新增重定向任务
+        $redirect_model = new DomainRedirectTask();
+        if($domain_301){
+            $domain_301 = Arr::a2s($domain_301);
+            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301,'status'=>['<',DomainRedirectTask::STATUS_SUC]]);
+            if(!$task_redirect_info){
+                $redirect_model->add([
+                    'origin_domain'=> $domain_301,
+                    'target_domain' => $info['domain']
+                ]);
+            }
+        }
+
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -274,9 +296,6 @@ class DomainInfoLogic extends BaseLogic
      * @date 2023/11/13
      * @date 2023/11/13
      */
      */
     public function check_cname($domain, $server_info){
     public function check_cname($domain, $server_info){
-        $checkA = false;
-        $checkCname = false;
-
         $process = new Process(['nslookup', '-qt=a', $domain]);
         $process = new Process(['nslookup', '-qt=a', $domain]);
         $process->run();
         $process->run();
         $output = explode(PHP_EOL, $process->getOutput());
         $output = explode(PHP_EOL, $process->getOutput());
@@ -305,6 +324,27 @@ class DomainInfoLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * 验证是否A记录解析到目标服务器
+     * @param $domain
+     * @param $ip
+     * @return mixed
+     */
+    public function check_a($domain, $ip){
+        $process = new Process(['nslookup', '-qt=a', $domain]);
+        $process->run();
+        $output = explode(PHP_EOL, $process->getOutput());
+        foreach ($output as $line){
+            if($line){
+                $checkA = strpos($line, $ip) !== false;
+                if($checkA){
+                    return $domain;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
      * 设置语种自定义跳转链接
      * 设置语种自定义跳转链接
      * @param $project_id
      * @param $project_id
      * @return array
      * @return array

@@ -15,6 +15,7 @@ use App\Models\Base;
  */
  */
 class DomainInfo extends Base
 class DomainInfo extends Base
 {
 {
+    const SERVER_IP_301 = '43.135.137.172';
     const STATUS_ONE = 1;
     const STATUS_ONE = 1;
     const STATUS_ZERO = 0;
     const STATUS_ZERO = 0;
     public $btAction = [
     public $btAction = [

+<?php
+
+namespace App\Models\Domain;
+
+use App\Models\Base;
+
+class DomainRedirectTask extends Base
+{
+    protected $table = 'gl_domain_redirect_task';
+
+    const STATUS_UN = 0;
+    const STATUS_ING = 1;
+    const STATUS_SUC = 2;
+    const STATUS_FAL = 3;
+}