From bcc80581d342c41ef09b3bfa5658ef249b4de219 Mon Sep 17 00:00:00 2001
From: DesperadoJ <38433236+DesperadoJ@users.noreply.github.com>
Date: Sat, 21 Mar 2020 19:50:29 +0800
Subject: [PATCH 1/2] Fix Quantumult sub

---
 app/Http/Controllers/Client/ClientController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 . '"';

From 9f9bb14e9d9f783be93c6804007dad52db6fa79f Mon Sep 17 00:00:00 2001
From: DesperadoJ <38433236+DesperadoJ@users.noreply.github.com>
Date: Sat, 21 Mar 2020 19:50:49 +0800
Subject: [PATCH 2/2] Fix email template typo

---
 resources/views/mail/classic/verify.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
                                         <td class="content-block"
                                             style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 16px; color: #4a4a4a; vertical-align: top; margin: 0; padding: 0 0 20px;"
                                             valign="top">
-                                            请填写以下验证码完成邮箱验证 (1分钟内有效)
+                                            请填写以下验证码完成邮箱验证 (5分钟内有效)
                                         </td>
                                     </tr>
                                     <tr