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

@@ -386,6 +386,18 @@ class HtmlCollect extends Command
             }
             }
         }
         }
 
 
+        //特殊项目
+        if ($project_id == 2226) {
+            preg_match_all('/data-parallax-image=[\'"](.*?)[\'"]>/i', $html, $result_s);
+            $special = $result_s[1] ?? [];
+            foreach ($special as $v_s) {
+                $check_v_s = $this->url_check($v_s, $project_id, $domain, $web_url_domain, $home_url);
+                if ($check_v_s && (!in_array($check_v_s, $source))) {
+                    $source[] = $check_v_s;
+                }
+            }
+        }
+
         return $source;
         return $source;
     }
     }
 
 

+<?php
+
+namespace App\Http\Controllers\Aside\AutoPull;
+
+use App\Enums\Common\Code;
+use App\Helper\Arr;
+use App\Http\Controllers\Aside\BaseController;
+use App\Models\AutoPull\AutoPullNotify;
+use App\Models\Manage\Manage;
+
+class AutoPullController extends BaseController
+{
+    /**
+     * 获取自动拉取代码任务列表
+     * @author Akun
+     * @date 2024/08/26 15:49
+     */
+    public function getTaskLists()
+    {
+        $autoModule = new AutoPullNotify();
+        $lists = $autoModule->lists($this->map, $this->page, $this->row);
+        if (!empty($lists)) {
+            $manage_model = new Manage();
+            foreach ($lists['list'] as $k => $v) {
+                $lists['list'][$k]['operator_name'] = $manage_model->getName($v['user_id']);
+                $lists['list'][$k]['server_name'] = AutoPullNotify::serversMap()[$v['server_id']];
+
+                $process = Arr::s2a($v['process']);
+                $process_name = [];
+                if ($process) {
+                    foreach ($process as $kp => $vp) {
+                        $process_name[$kp] = AutoPullNotify::processMap()[$vp];
+                    }
+                }
+
+                $lists['list'][$k]['process_name'] = $process_name;
+            }
+        }
+
+        $this->response('success', Code::SUCCESS, $lists);
+    }
+
+    /**
+     * 添加自动拉取代码任务
+     * @author Akun
+     * @date 2024/08/26 16:31
+     */
+    public function saveTask()
+    {
+        $this->request->validate([
+            'server_id' => 'required',
+        ], [
+            'server_id.required' => '服务器不能为空'
+        ]);
+
+        $model = new AutoPullNotify();
+
+        foreach ($this->param['server_id'] as $v) {
+            $model->add([
+                'user_id' => $this->uid,
+                'server_id' => $v,
+                'process' => Arr::a2s($this->param['process'] ?? []),
+                'status' => 0
+            ]);
+        }
+
+        $this->response('success');
+    }
+
+    /**
+     * 获取服务器及进程配置
+     * @author Akun
+     * @date 2024/08/26 16:07
+     */
+    public function taskMap()
+    {
+        $servers = AutoPullNotify::serversMap();
+        $process = AutoPullNotify::processMap();
+
+        $lists = [
+            'servers' => $servers,
+            'process' => $process
+        ];
+
+        $this->response('success', Code::SUCCESS, $lists);
+    }
+}

+<?php
+
+namespace App\Models\AutoPull;
+
+use App\Models\Base;
+
+class AutoPullNotify extends Base
+{
+    protected $table = 'gl_auto_pull_notify';
+
+    public static function serversMap()
+    {
+        return [
+            1 => '硅谷云服务器',
+            9 => '硅谷IDC服务器01(6.0美服1)',
+            3 => '硅谷IDC服务器02(6.0美服2)',
+            2 => '俄罗斯服务器',
+            4 => '阿里云深圳服务器',
+            5 => '日本服务器',
+            8 => '香港服务器',
+        ];
+    }
+
+    public static function processMap()
+    {
+        return [
+            'php artisan handle_html' => '拉取页面zip文件并解压',
+            'php artisan create_update_page_route' => '创建主站路由',
+            'php artisan create_update_page_master' => '生成主站页面',
+            'php artisan create_update_page_minor' => '生成小语种页面',
+            'php artisan create_update_page_now' => '实时生成主站页面',
+            'php artisan create_update_page_sitemap' => '生成主站sitemap,robots',
+            'php artisan create_update_amp_route' => '创建amp站路由',
+            'php artisan create_update_page_amp' => '生成amp站页面',
+            'php artisan create_update_amp_sitemap' => '生成amp站sitemap,robots',
+        ];
+    }
+}

@@ -465,6 +465,14 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/saveModule', [Aside\ExtentModule\ExtensionModuleController::class, 'saveModule'])->name('admin.extension_module_saveModule');
         Route::any('/saveModule', [Aside\ExtentModule\ExtensionModuleController::class, 'saveModule'])->name('admin.extension_module_saveModule');
         Route::any('/delModule', [Aside\ExtentModule\ExtensionModuleController::class, 'delModule'])->name('admin.extension_module_delModule');
         Route::any('/delModule', [Aside\ExtentModule\ExtensionModuleController::class, 'delModule'])->name('admin.extension_module_delModule');
     });
     });
+    /**
+     * C端代码自动拉取模块
+     */
+    Route::prefix('auto_pull')->group(function () {
+        Route::any('/', [Aside\AutoPull\AutoPullController::class, 'getTaskLists'])->name('admin.auto_pull_getTaskLists');
+        Route::any('/saveTask', [Aside\AutoPull\AutoPullController::class, 'saveTask'])->name('admin.auto_pull_saveTask');
+        Route::any('/taskMap', [Aside\AutoPull\AutoPullController::class, 'taskMap'])->name('admin.auto_pull_taskMap');
+    });
 });
 });
 
 
 //无需登录验证的路由组
 //无需登录验证的路由组