diff --git a/internal/logic/server/getServerUserListLogic.go b/internal/logic/server/getServerUserListLogic.go index 5c551e0..f32c97a 100644 --- a/internal/logic/server/getServerUserListLogic.go +++ b/internal/logic/server/getServerUserListLogic.go @@ -364,12 +364,11 @@ func (l *GetServerUserListLogic) calculateEffectiveSpeedLimit(sub *subscribe.Sub // 如果已使用流量达到或超过阈值,应用限速 if usedGB >= float64(rule.TrafficUsage) { // 如果规则限速大于0,应用该限速 - // rule.SpeedLimit 单位是 KB,baseSpeedLimit 单位是 Bytes,需要转换 - ruleSpeedBytes := rule.SpeedLimit * 1024 - if ruleSpeedBytes > 0 { + // rule.SpeedLimit 单位与 baseSpeedLimit 相同(Mbps),直接比较 + if rule.SpeedLimit > 0 { // 如果基础限速为0(无限速)或规则限速更严格,使用规则限速 - if baseSpeedLimit == 0 || ruleSpeedBytes < baseSpeedLimit { - return ruleSpeedBytes + if baseSpeedLimit == 0 || rule.SpeedLimit < baseSpeedLimit { + return rule.SpeedLimit } } }