yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-11-01 01:41:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

subs: following shadowsocks SIP008 new changes

Browse Source 
- do not use infix dereference operator to following the whole
This commit is contained in:
Beta Soft
2020-12-24 13:02:43 +08:00
parent b8b7033132
commit d1cfc9815b
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ class ClientController extends Controller
private function quantumult($user, $servers = []) private function quantumult($user, $servers = [])
{ {
$uri = ''; $uri = '';
header('subscription-userinfo: upload=' . $user->u . '; download=' . $user->d . ';total=' . $user->transfer_enable); header('subscription-userinfo: upload=' . $user['u'] . '; download=' . $user['d'] . ';total=' . $user['transfer_enable']);
foreach ($servers as $item) { foreach ($servers as $item) {
if ($item['type'] === 'v2ray') { if ($item['type'] === 'v2ray') {
$str = ''; $str = '';
@@ -84,10 +84,10 @@ class ClientController extends Controller
{ {
$uri = ''; $uri = '';
//display remaining traffic and expire date //display remaining traffic and expire date
$upload = round($user->u / (1024*1024*1024), 2); $upload = round($user['u'] / (1024*1024*1024), 2);
$download = round($user->d / (1024*1024*1024), 2); $download = round($user['d'] / (1024*1024*1024), 2);
$totalTraffic = round($user->transfer_enable / (1024*1024*1024), 2); $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
$expiredDate = date('Y-m-d', $user->expired_at); $expiredDate = date('Y-m-d', $user['expired_at']);
$uri .= "STATUS=🚀↑:{$upload}GB,↓:{$download}GB,TOT:{$totalTraffic}GB💡Expires:{$expiredDate}\r\n"; $uri .= "STATUS=🚀↑:{$upload}GB,↓:{$download}GB,TOT:{$totalTraffic}GB💡Expires:{$expiredDate}\r\n";
foreach ($servers as $item) { foreach ($servers as $item) {
if ($item['type'] === 'shadowsocks') { if ($item['type'] === 'shadowsocks') {
@@ -106,7 +106,7 @@ class ClientController extends Controller
private function quantumultX($user, $servers = []) private function quantumultX($user, $servers = [])
{ {
$uri = ''; $uri = '';
header("subscription-userinfo: upload={$user->u}; download={$user->d}; total={$user->transfer_enable}; expire={$user->expired_at}"); header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
foreach ($servers as $item) { foreach ($servers as $item) {
if ($item['type'] === 'shadowsocks') { if ($item['type'] === 'shadowsocks') {
$uri .= QuantumultX::buildShadowsocks($user['uuid'], $item); $uri .= QuantumultX::buildShadowsocks($user['uuid'], $item);
@@ -143,6 +143,11 @@ class ClientController extends Controller
$configs = []; $configs = [];
$subs = []; $subs = [];
$subs['servers'] = []; $subs['servers'] = [];
$subs['bytes_used'] = '';
$subs['bytes_remaining'] = '';
$bytesUsed = $user['u'] + $user['d'];
$bytesRemaining = $user['transfer_enable'] - $bytesUsed;
foreach ($servers as $item) { foreach ($servers as $item) {
if ($item['type'] === 'shadowsocks') { if ($item['type'] === 'shadowsocks') {
@@ -151,7 +156,8 @@ class ClientController extends Controller
} }
$subs['version'] = 1; $subs['version'] = 1;
$subs['remark'] = config('v2board.app_name', 'V2Board'); $subs['bytes_used'] = $bytesUsed;
$subs['bytes_remaining'] = $bytesRemaining;
$subs['servers'] = array_merge($subs['servers'] ? $subs['servers'] : [], $configs); $subs['servers'] = array_merge($subs['servers'] ? $subs['servers'] : [], $configs);
return json_encode($subs, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); return json_encode($subs, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);

2
app/Utils/URLSchemes.php
View File

@@ -21,7 +21,7 @@ class URLSchemes
{ {
$config = [ $config = [
"id" => $server['id'], "id" => $server['id'],
"remark" => $server['name'], "remarks" => $server['name'],
"server" => $server['host'], "server" => $server['host'],
"server_port" => $server['port'], "server_port" => $server['port'],
"password" => $user['uuid'], "password" => $user['uuid'],