shadowrocket: remark space issue fixes, add shadowrocket STATUS feature

Signed-off-by: Beta Soft <betaxab@gmail.com>
This commit is contained in:
Beta Soft 2020-07-23 09:59:17 +08:00
parent e3aa467a74
commit d8ee3c6c51
No known key found for this signature in database
GPG Key ID: 180A31AB98D5C156
2 changed files with 7 additions and 3 deletions

View File

@ -73,8 +73,12 @@ class ClientController extends Controller
private function shadowrocket($user, $vmess = [], $trojan = [])
{
$uri = '';
//TODO: display remaining traffic and expire date
//$uri .= 'STATUS=' . 'Traffic:' . 'Expiry:' . '\r\n';
//display remaining traffic and expire date
$upload = round($user->u / (1024*1024*1024), 2);
$download = round($user->d / (1024*1024*1024), 2);
$totalTraffic = round($user->transfer_enable / (1024*1024*1024), 2);
$expiredDate = date('Y-m-d', $user->expired_at);
$uri .= "STATUS=🚀↑:{$upload}GB,↓:{$download}GB,TOT:{$totalTraffic}GB💡Expires:{$expiredDate}\r\n";
foreach ($vmess as $item) {
$uri .= Shadowrocket::buildVmess($user->uuid, $item);
}

View File

@ -23,7 +23,7 @@ class Shadowrocket
if (isset($wsSettings->path)) $config['path'] = $wsSettings->path;
if (isset($wsSettings->headers->Host)) $config['obfsParam'] = $wsSettings->headers->Host;
}
$query = http_build_query($config);
$query = http_build_query($config, null, '&', PHP_QUERY_RFC3986);
$uri = "vmess://{$userinfo}?{$query}&tfo=1";
$uri .= "\r\n";
return $uri;