新功能(#69): 支持用户级限速覆盖

Co-authored-by: multica-agent <github@multica.ai>
2026-05-26 11:26:27 -07:00
parent 22d9773f1b
commit f30b7cded7
9 changed files with 95 additions and 42 deletions
@@ -36,6 +36,10 @@ func (l *GetUserSubscribeByIdLogic) GetUserSubscribeById(req *types.GetUserSubsc
 	}
 	var subscribeDetails types.UserSubscribeDetail
 	tool.DeepCopy(&subscribeDetails, sub)
+	subscribeDetails.SpeedLimit = sub.SpeedLimit
+	if sub.TrafficLimit != nil {
+		subscribeDetails.TrafficLimit = *sub.TrafficLimit
+	}

 	// 填充分组名
 	if sub.NodeGroupId > 0 {
@@ -47,7 +51,17 @@ func (l *GetUserSubscribeByIdLogic) GetUserSubscribeById(req *types.GetUserSubsc

 	// Calculate speed limit status
 	if sub.Subscribe != nil && sub.Status == 1 {
-		result := speedlimit.Calculate(l.ctx, l.svcCtx.DB, sub.UserId, sub.Id, sub.Subscribe.SpeedLimit, sub.Subscribe.TrafficLimit)
+		baseSpeed := sub.Subscribe.SpeedLimit
+		if sub.SpeedLimit > 0 {
+			baseSpeed = sub.SpeedLimit
+		}
+
+		trafficLimit := sub.Subscribe.TrafficLimit
+		if sub.TrafficLimit != nil && *sub.TrafficLimit != "" {
+			trafficLimit = *sub.TrafficLimit
+		}
+
+		result := speedlimit.Calculate(l.ctx, l.svcCtx.DB, sub.UserId, sub.Id, baseSpeed, trafficLimit)
 		subscribeDetails.EffectiveSpeed = result.EffectiveSpeed
 		subscribeDetails.IsThrottled = result.IsThrottled
 		subscribeDetails.ThrottleRule = result.ThrottleRule