lkddi/Xboard
1
0
Fork 0
mirror of https://github.com/lkddi/Xboard.git synced 2026-04-14 02:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve issue where dynamic rate cannot be disabled

Browse Source
This commit is contained in:
xboard
2025-07-21 08:29:14 +08:00
parent 90360cfeb5
commit 61773a13b4
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Models/Server.php
View File

@@ -28,6 +28,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
* @property string|null $network 网络类型
* @property int|null $parent_id 父节点ID
* @property float|null $rate 倍率
* @property boolean $rate_time_enable 是否启用时间范围功能
* @property array|null $rate_time_ranges 倍率时间范围
* @property int|null $sort 排序
* @property array|null $protocol_settings 协议设置
@@ -455,13 +456,15 @@ class Server extends Model
public function getCurrentRate(): float
{
$now = date('H:i');
$ranges = $this->rate_time_ranges ?? [];
foreach ($ranges as $range) {
if ($now >= $range['start'] && $now <= $range['end']) {
return (float) $range['rate'];
}
if (!$this->rate_time_enable) {
return (float) $this->rate;
}
return (float) $this->rate;
$now = now()->format('H:i');
$ranges = $this->rate_time_ranges ?? [];
$matchedRange = collect($ranges)
->first(fn($range) => $now >= $range['start'] && $now <= $range['end']);
return $matchedRange ? (float) $matchedRange['rate'] : (float) $this->rate;
}
}