yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2024-09-20 21:04:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from DesperadoJ/dev

Browse Source 
Minor bug fixes
This commit is contained in:
tokumeikoi 2020-03-21 19:57:54 +08:00 committed by GitHub
commit 40e5ee62b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Client/ClientController.php
View File

@ -68,7 +68,7 @@ class ClientController extends Controller
$str = ''; $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'); $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') { if ($item->network === 'ws') {
$str .= ', obfs=' . ($item->tls ? 'wss' : 'ws'); $str .= ', obfs=ws';
if ($item->networkSettings) { if ($item->networkSettings) {
$wsSettings = json_decode($item->networkSettings); $wsSettings = json_decode($item->networkSettings);
if (isset($wsSettings->path)) $str .= ', obfs-path="' . $wsSettings->path . '"'; if (isset($wsSettings->path)) $str .= ', obfs-path="' . $wsSettings->path . '"';

2
resources/views/mail/classic/verify.blade.php
View File

@ -125,7 +125,7 @@
<td class="content-block" <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;" 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"> valign="top">
请填写以下验证码完成邮箱验证 (1分钟内有效) 请填写以下验证码完成邮箱验证 (5分钟内有效)
</td> </td>
</tr> </tr>
<tr <tr