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

@@ -39,17 +39,64 @@ class Temp extends Command
      */
      */
     protected $description = '临时脚本(akun)';
     protected $description = '临时脚本(akun)';
 
 
-    public function handle()
+    public function handle(){
+
+    }
+
+    /**
+     * www.docareco.com批量设置301跳转
+     * @author Akun
+     * @date 2025/04/21 16:12
+     */
+    public function setDomain301()
     {
     {
+        $domain_extend_config = DomainInfo::where('domain', 'www.docareco.com')->value('extend_config');
+
+        $domain_origin_list = $domain_extend_config ? array_column($domain_extend_config, 'origin') : [];
+
+        //读取csv文件
+        $file = 'C:\Users\Akun\Desktop\有排名网页-还未做301-4.21.csv';
+        $line_of_text = [];
+        try {
+            $file_handle = fopen($file, 'r');
+            while (!feof($file_handle)) {
+                $line_of_text[] = fgetcsv($file_handle, 0, ',');
+            }
+            fclose($file_handle);
+        } catch (\Exception $e) {
+            $this->output($e->getMessage());
+        }
+
+        if (count($line_of_text) > 1) {
+            foreach ($line_of_text as $k => $v) {
+                if ($k > 0 && $v) {
+                    $origin = str_replace('https://www.docareco.com', '', $v[0]);
+                    $target = str_replace('https://www.docareco.com', '', $v[1]);
+
+                    if (!in_array($origin, $domain_origin_list)) {
+                        $domain_extend_config[] = [
+                            'origin' => $origin,
+                            'target' => $target
+                        ];
+                    }
+                }
+            }
+        }
+
+        DomainInfo::where('domain', 'www.docareco.com')->update(['extend_config' => Arr::a2s($domain_extend_config)]);
 
 
+        $this->output('success');
     }
     }
 
 
+
+
     /**
     /**
      * 未被标注 特殊前后缀   && 未达标项目 && 优化开始时间 > 2025-01-01 00:00:00 ,开启自动添加聚合页关键词的前后缀关键词配置
      * 未被标注 特殊前后缀   && 未达标项目 && 优化开始时间 > 2025-01-01 00:00:00 ,开启自动添加聚合页关键词的前后缀关键词配置
      * @author Akun
      * @author Akun
      * @date 2025/04/02 14:00
      * @date 2025/04/02 14:00
      */
      */
-    public function changeIsAutoKeywords(){
+    public function changeIsAutoKeywords()
+    {
         $project_list = DeployOptimize::where('special', 'not like', '%,8,%')->where('start_date', '>', '2025-01-01 00:00:00')->get();
         $project_list = DeployOptimize::where('special', 'not like', '%,8,%')->where('start_date', '>', '2025-01-01 00:00:00')->get();
 
 
         foreach ($project_list as $project) {
         foreach ($project_list as $project) {

@@ -195,17 +195,36 @@ class DomainInfoLogic extends BaseLogic
             }
             }
         }
         }
 
 
-        //如果要开通amp站点，判断m域名是否已经解析
+        $domain_array = parse_url($info['domain']);
+        $host = $domain_array['host'] ?? $domain_array['path'];
+        $host_array = explode('.',$host);
+
+        if($this->param['type'] == 3){
+            //需要申请通配符证书，判断_acme-challenge是否已经解析
+            $host_array_ssl = $host_array;
+            if (count($host_array_ssl) <= 2) {
+                array_unshift($host_array_ssl, '_acme-challenge');
+            } else {
+                $host_array_ssl[0] = '_acme-challenge';
+            }
+            $ssl_domain = implode('.',$host_array_ssl);
+
+            $ssl_records = dns_get_record($ssl_domain,DNS_CNAME);
+            $ssl_target = $ssl_records[0]['target']??'';
+            if($ssl_target != '_acme-challenge.globalsosslcheck.com'){
+                $this->fail('域名' . $ssl_domain . '未解析至目标服务器');
+            }
+        }
+
         if(isset($this->param['amp_status']) && $this->param['amp_status'] == 1){
         if(isset($this->param['amp_status']) && $this->param['amp_status'] == 1){
-            $domain_array = parse_url($info['domain']);
-            $host = $domain_array['host'] ?? $domain_array['path'];
-            $host_array = explode('.',$host);
-            if (count($host_array) <= 2) {
-                array_unshift($host_array, 'm');
+            //需要开通amp站点，判断m域名是否已经解析
+            $host_array_amp = $host_array;
+            if (count($host_array_amp) <= 2) {
+                array_unshift($host_array_amp, 'm');
             } else {
             } else {
-                $host_array[0] = 'm';
+                $host_array_amp[0] = 'm';
             }
             }
-            $amp_domain = implode('.',$host_array);
+            $amp_domain = implode('.',$host_array_amp);
             if(!check_domain_record($amp_domain, $serversIpInfo)){
             if(!check_domain_record($amp_domain, $serversIpInfo)){
                 $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
                 $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
             }
             }

@@ -46,7 +46,7 @@ class OptimizeCheckLog extends Base
             $param['images'] = Arr::a2s($param['images'] ?? []);
             $param['images'] = Arr::a2s($param['images'] ?? []);
         }
         }
         $param['operator_id'] = $manage_id;
         $param['operator_id'] = $manage_id;
-        $param['date'] = date('Y-m-d H:i:s');
+        $param['date'] = $param['date'] ?? date('Y-m-d H:i:s');
         return $param;
         return $param;
     }
     }
 }
 }