diff --git a/app/Http/Controllers/Client/ClientController.php b/app/Http/Controllers/Client/ClientController.php index 1ab14ea2..6e5ef286 100755 --- a/app/Http/Controllers/Client/ClientController.php +++ b/app/Http/Controllers/Client/ClientController.php @@ -68,7 +68,7 @@ class ClientController extends Controller $str = ''; $str .= $item->name . '= vmess, ' . $item->host . ', ' . $item->port . ', chacha20-ietf-poly1305, "' . $user->v2ray_uuid . '", over-tls=' . ($item->tls ? "true" : "false") . ', certificate=0, group=' . config('v2board.app_name', 'V2Board'); if ($item->network === 'ws') { - $str .= ', obfs=' . ($item->tls ? 'wss' : 'ws'); + $str .= ', obfs=ws'; if ($item->networkSettings) { $wsSettings = json_decode($item->networkSettings); if (isset($wsSettings->path)) $str .= ', obfs-path="' . $wsSettings->path . '"'; diff --git a/resources/views/mail/classic/verify.blade.php b/resources/views/mail/classic/verify.blade.php index 84b71ce1..dea8f03e 100644 --- a/resources/views/mail/classic/verify.blade.php +++ b/resources/views/mail/classic/verify.blade.php @@ -125,7 +125,7 @@ - 请填写以下验证码完成邮箱验证 (1分钟内有效) + 请填写以下验证码完成邮箱验证 (5分钟内有效)