From fa6dfc6acbc98fef85a933849a97b1da4a1f0e7a Mon Sep 17 00:00:00 2001 From: xboard Date: Fri, 3 May 2024 15:04:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DSurge=20surfboard?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E4=B8=AD=E7=9A=84=E5=89=A9=E4=BD=99=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Protocols/Surfboard.php | 3 ++- app/Protocols/Surge.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Protocols/Surfboard.php b/app/Protocols/Surfboard.php index b398aa9..ebfeadf 100644 --- a/app/Protocols/Surfboard.php +++ b/app/Protocols/Surfboard.php @@ -75,8 +75,9 @@ class Surfboard $download = round($user['d'] / (1024*1024*1024), 2); $useTraffic = $upload + $download; $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2); + $unusedTraffic = $totalTraffic - $useTraffic; $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']); - $subscribeInfo = "title={$appName}订阅信息, content=上传流量:{$upload}GB\\n下载流量:{$download}GB\\n剩余流量:{$useTraffic}GB\\n套餐流量:{$totalTraffic}GB\\n到期时间:{$expireDate}"; + $subscribeInfo = "title={$appName}订阅信息, content=上传流量:{$upload}GB\\n下载流量:{$download}GB\\n剩余流量: { $unusedTraffic }GB\\n套餐流量:{$totalTraffic}GB\\n到期时间:{$expireDate}"; $config = str_replace('$subscribe_info', $subscribeInfo, $config); return response($config, 200) diff --git a/app/Protocols/Surge.php b/app/Protocols/Surge.php index 0b8d9da..587e5ce 100644 --- a/app/Protocols/Surge.php +++ b/app/Protocols/Surge.php @@ -76,8 +76,9 @@ class Surge $download = round($user['d'] / (1024*1024*1024), 2); $useTraffic = $upload + $download; $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2); + $unusedTraffic = $totalTraffic - $useTraffic; $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']); - $subscribeInfo = "title={$appName}订阅信息, content=上传流量:{$upload}GB\\n下载流量:{$download}GB\\n剩余流量:{$useTraffic}GB\\n套餐流量:{$totalTraffic}GB\\n到期时间:{$expireDate}"; + $subscribeInfo = "title={$appName}订阅信息, content=上传流量:{$upload}GB\\n下载流量:{$download}GB\\n剩余流量:{ $unusedTraffic }GB\\n套餐流量:{$totalTraffic}GB\\n到期时间:{$expireDate}"; $config = str_replace('$subscribe_info', $subscribeInfo, $config); return response($config, 200)