Merge 42542725f7 into 89d2aed46d

This reverts commit ae249f8e96.

app/Protocols/ClashMeta.php

@@ -194,8 +194,6 @@ class ClashMeta
         $array['server'] = $server['host'];
         $array['port'] = $server['port'];
         $array['uuid'] = $password;
-        $array['alterId'] = 0;
-        $array['cipher'] = 'auto';
         $array['udp'] = true;
 
         // XTLS流控算法
@@ -242,10 +240,8 @@ class ClashMeta
                     $array['ws-opts']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
                     $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
-                if (isset($wsSettings['path']) && !empty($wsSettings['path']))
-                    $array['ws-path'] = $wsSettings['path'];
-                if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
-                    $array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']];
+				$array['ws-opts']['max-early-data'] = 2560;
+                $array['ws-opts']['early-data-header-name'] = 'Sec-WebSocket-Protocol';
             }
         }
         if ($server['network'] === 'grpc') {

app/Protocols/Shadowrocket.php

@@ -190,7 +190,7 @@ class Shadowrocket
             if ($server['network_settings']) {
                 $wsSettings = $server['network_settings'];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
-                    $config['path'] = $wsSettings['path'];
+                    $config['path'] = $wsSettings['path'] . '?ed=2560';
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
                     $config['obfsParam'] = $wsSettings['headers']['Host'];
             }

app/Protocols/SingBox.php

@@ -149,7 +149,7 @@ class SingBox
                     $array['transport']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
                     $array['transport']['headers'] = ['Host' => array($wsSettings['headers']['Host'])];
-                $array['transport']['max_early_data'] = 2048;
+                $array['transport']['max_early_data'] = 2560;
                 $array['transport']['early_data_header_name'] = 'Sec-WebSocket-Protocol';
             }
         }
@@ -217,7 +217,7 @@ class SingBox
                     $array['transport']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
                     $array['transport']['headers'] = ['Host' => array($wsSettings['headers']['Host'])];
-                $array['transport']['max_early_data'] = 2048;
+                $array['transport']['max_early_data'] = 2560;
                 $array['transport']['early_data_header_name'] = 'Sec-WebSocket-Protocol';
             }
         }
@@ -272,7 +272,7 @@ class SingBox
                 if (isset($server['network_settings']['headers']['Host'])) {
                     $array['transport']['headers'] = ['Host' => array($server['network_settings']['headers']['Host'])];
                 }
-                $array['transport']['max_early_data'] = 2048;
+                $array['transport']['max_early_data'] = 2560;
                 $array['transport']['early_data_header_name'] = 'Sec-WebSocket-Protocol';
             }
         }

docs/1panel安装指南.md

@@ -83,15 +83,13 @@
 3. 在站点目录中执行以下命令从 Github 克隆到当前目录：
 
     ```
-    git clone https://github.com/cedar2025/Xboard ./
-    cp docker-compose.sample.yaml docker-compose.yaml
+    git clone -b  docker-compose --depth 1 https://github.com/cedar2025/Xboard ./
     ```
 
 4. 执行以下命令安装 Xboard：
 
     ```
-    
-    docker compose run -it --rm xboard sh init.sh
+    docker compose run -it --rm xboard php artisan xboard:install
     ```
 
 5. 根据提示输入上述创建的数据库账号密码，选择使用内置 redis 完成安装。