Merge pull request #129 from DesperadoJ/dev

Minor bug fixes

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

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