合并 internal → main: 退款/提现/激活/CI 全面优化 #4

Open
shanshanzhong147 wants to merge 76 commits from internal into main
2 changed files with 6 additions and 0 deletions
Showing only changes of commit de388ac1ef - Show all commits
@@ -75,8 +75,12 @@ func buildUserSubscribeListItem(item *user.SubscribeDetails, groupName string) t
sub.Short, _ = tool.FixedUniqueString(item.Token, 8, "")
sub.NodeGroupId = item.NodeGroupId
sub.NodeGroupName = groupName
sub.SpeedLimit = item.SpeedLimit
if item.TrafficLimit != nil && *item.TrafficLimit != "" {
_ = json.Unmarshal([]byte(*item.TrafficLimit), &sub.TrafficLimit)
}
if item.Subscribe != nil {
sub.PlanSpeedLimit = item.Subscribe.SpeedLimit
}
return sub
}
+2
View File
@@ -3694,7 +3694,9 @@ type UserSubscribe struct {
Traffic int64 `json:"traffic"`
Download int64 `json:"download"`
Upload int64 `json:"upload"`
SpeedLimit int64 `json:"speed_limit"`
TrafficLimit []TrafficLimit `json:"user_traffic_limit"`
PlanSpeedLimit int64 `json:"plan_speed_limit"`
Token string `json:"token"`
Status uint8 `json:"status"`
EntitlementSource string `json:"entitlement_source"`