From 8d4846329e9994b5b249cd25d8b981ab42ca1667 Mon Sep 17 00:00:00 2001 From: xboard Date: Sun, 3 Dec 2023 19:21:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSingBox=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E5=B8=A6=E6=B7=B7=E6=B7=86=E7=9A=84hysteria=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Protocols/SingBox.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Protocols/SingBox.php b/app/Protocols/SingBox.php index 16709e7..bbc7d56 100644 --- a/app/Protocols/SingBox.php +++ b/app/Protocols/SingBox.php @@ -293,8 +293,8 @@ class SingBox $array['type'] = 'hysteria'; $array['up_mbps'] = $user->speed_limit ? min($server['down_mbps'], $user->speed_limit) : $server['down_mbps']; $array['down_mbps'] = $user->speed_limit ? min($server['up_mbps'], $user->speed_limit) : $server['up_mbps']; - if (isset($server['obfs']) && isset($server['obfs_password'])) { - $array['obfs'] = $server['obfs_password']; + if ($server['is_obfs']) { + $array['obfs'] = $server['server_key']; } $array['disable_mtu_discovery'] = true; @@ -305,9 +305,9 @@ class SingBox $array['type'] = 'hysteria2'; $array['password'] = $password; - if (isset($server['obfs'])) { - $array['obfs']['type'] = $server['obfs']; - $array['obfs']['password'] = $server['obfs_password']; + if ($server['is_obfs']) { + $array['obfs']['type'] = 'salamander'; + $array['obfs']['password'] = $server['server_key']; } }