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

@@ -126,65 +126,6 @@ class Temp extends Command
     }
     }
 
 
     /**
     /**
-     * 创建指定服务器所有项目主站生成任务
-     * @author Akun
-     * @date 2024/12/19 17:54
-     */
-    public function create_server_update_page()
-    {
-        $server_id = 15;
-
-        $server_ip_model = new ServersIp();
-
-        $server_ip_ids = $server_ip_model->where('servers_id', $server_id)->get()->pluck('id')->toArray();
-
-        $project_list = Project::select(['id', 'serve_id'])->whereIn('serve_id', $server_ip_ids)->get();
-
-        $domain_model = new DomainInfo();
-        $notify_model = new Notify();
-
-        foreach ($project_list as $value) {
-            $project_id = $value->id;
-
-            $domain_info = $domain_model->read(['project_id' => $project_id, 'status' => 1], ['id', 'domain']);
-            if (!$domain_info) {
-                //过滤未绑定正式域名的项目
-                continue;
-            }
-            $domain = $domain_info['domain'];
-
-            //获取项目所在服务器
-            $serve_ip_info = $server_ip_model->read(['id' => $value->serve_id], ['domain', 'ip']);
-            if (!$serve_ip_info) {
-                $this->output('项目id:' . $project_id . ' | 未查询到服务器数据');
-                continue;
-            }
-
-            if (!check_domain_record($domain, $serve_ip_info)) {
-                $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
-                continue;
-            }
-
-            $data = [
-                'project_id' => $project_id,
-                'type' => 1,
-                'route' => 1,
-                'server_id' => $server_id,
-                'status' => ['!=', Notify::STATUS_FINISH_SITEMAP]
-            ];
-            $notify = $notify_model->read($data, ['id']);
-
-            if (!$notify) {
-                $data['data'] = Arr::a2s(['domain' => $domain, 'url' => null, 'language' => []]);
-                $data['status'] = Notify::STATUS_INIT;
-                $notify_model->add($data);
-
-                $this->output('项目id:' . $project_id . ' | success');
-            }
-        }
-    }
-
-    /**
      * 判断指定服务器项目是否正常访问
      * 判断指定服务器项目是否正常访问
      * @author Akun
      * @author Akun
      * @date 2024/12/11 10:15
      * @date 2024/12/11 10:15
@@ -272,6 +213,7 @@ class Temp extends Command
     public function get_all_projects_by_server()
     public function get_all_projects_by_server()
     {
     {
         $server_id = 1;
         $server_id = 1;
+        $server_name = '240云服务器';
 
 
         $server_ip_model = new ServersIp();
         $server_ip_model = new ServersIp();
 
 
@@ -297,7 +239,7 @@ class Temp extends Command
         }
         }
         $map = ['项目id', '名称', '域名'];
         $map = ['项目id', '名称', '域名'];
         if ($data) {
         if ($data) {
-            $table = new BatchExportService("240云服务器项目");
+            $table = new BatchExportService($server_name . '项目');
             $file = $table->head($map)->data($data)->save();
             $file = $table->head($map)->data($data)->save();
             if (!$file) {
             if (!$file) {
                 $this->output('文件生成失败，请重试');
                 $this->output('文件生成失败，请重试');
@@ -371,6 +313,7 @@ class Temp extends Command
     public function check_no_server_projects()
     public function check_no_server_projects()
     {
     {
         $server_id = 15;
         $server_id = 15;
+        $server_name = '美服1';
 
 
         $server_ip_model = new ServersIp();
         $server_ip_model = new ServersIp();
 
 
@@ -403,7 +346,7 @@ class Temp extends Command
         }
         }
         $map = ['项目id', '名称', '域名', 'IP', '服务器ID',];
         $map = ['项目id', '名称', '域名', 'IP', '服务器ID',];
         if ($data) {
         if ($data) {
-            $table = new BatchExportService("美服2项目解析未在当前服务器项目");
+            $table = new BatchExportService($server_name . '解析未在当前服务器项目');
             $file = $table->head($map)->data($data)->save();
             $file = $table->head($map)->data($data)->save();
             if (!$file) {
             if (!$file) {
                 $this->output('文件生成失败，请重试');
                 $this->output('文件生成失败，请重试');
@@ -416,6 +359,65 @@ class Temp extends Command
     }
     }
 
 
     /**
     /**
+     * 创建指定服务器所有项目主站生成任务
+     * @author Akun
+     * @date 2024/12/19 17:54
+     */
+    public function create_server_update_page()
+    {
+        $server_id = 15;
+
+        $server_ip_model = new ServersIp();
+
+        $server_ip_ids = $server_ip_model->where('servers_id', $server_id)->get()->pluck('id')->toArray();
+
+        $project_list = Project::select(['id', 'serve_id'])->whereIn('serve_id', $server_ip_ids)->get();
+
+        $domain_model = new DomainInfo();
+        $notify_model = new Notify();
+
+        foreach ($project_list as $value) {
+            $project_id = $value->id;
+
+            $domain_info = $domain_model->read(['project_id' => $project_id, 'status' => 1], ['id', 'domain']);
+            if (!$domain_info) {
+                //过滤未绑定正式域名的项目
+                continue;
+            }
+            $domain = $domain_info['domain'];
+
+            //获取项目所在服务器
+            $serve_ip_info = $server_ip_model->read(['id' => $value->serve_id], ['domain', 'ip']);
+            if (!$serve_ip_info) {
+                $this->output('项目id:' . $project_id . ' | 未查询到服务器数据');
+                continue;
+            }
+
+            if (!check_domain_record($domain, $serve_ip_info)) {
+                $this->output('项目id:' . $project_id . ', domain:' . $domain . ' | 未解析到目标服务器');
+                continue;
+            }
+
+            $data = [
+                'project_id' => $project_id,
+                'type' => 1,
+                'route' => 1,
+                'server_id' => $server_id,
+                'status' => ['!=', Notify::STATUS_FINISH_SITEMAP]
+            ];
+            $notify = $notify_model->read($data, ['id']);
+
+            if (!$notify) {
+                $data['data'] = Arr::a2s(['domain' => $domain, 'url' => null, 'language' => []]);
+                $data['status'] = Notify::STATUS_INIT;
+                $notify_model->add($data);
+
+                $this->output('项目id:' . $project_id . ' | success');
+            }
+        }
+    }
+
+    /**
      * 创建所有amp站页面生成任务
      * 创建所有amp站页面生成任务
      * @author Akun
      * @author Akun
      * @date 2024/09/26 10:48
      * @date 2024/09/26 10:48
@@ -435,10 +437,10 @@ class Temp extends Command
             $domain_array = parse_url($domain);
             $domain_array = parse_url($domain);
             $host = $domain_array['host'] ?? $domain_array['path'];
             $host = $domain_array['host'] ?? $domain_array['path'];
             $host_array = explode('.', $host);
             $host_array = explode('.', $host);
-            if($host_array[0] == 'www'){
+            if ($host_array[0] == 'www') {
                 $host_array[0] = 'm';
                 $host_array[0] = 'm';
-            }else{
-                array_unshift($host_array,'m');
+            } else {
+                array_unshift($host_array, 'm');
             }
             }
             $amp_domain = implode('.', $host_array);
             $amp_domain = implode('.', $host_array);