fix: Remove merge conflict markers and add WebSocket limit warnings

- Clean up remaining conflict markers in SetMarginMode
- Add visual warnings for WebSocket stream limits in UI
- Prevent user from exceeding 250 symbols (1024 streams / 4 timeframes)
This commit is contained in:
ZhouYongyou
2025-11-03 21:57:55 +08:00
parent a95faf6552
commit b3e97072a9
2 changed files with 71 additions and 7 deletions

View File

@@ -214,19 +214,12 @@ func (t *FuturesTrader) SetMarginMode(symbol string, isCrossMargin bool) error {
}
// 尝试设置仓位模式
<<<<<<< HEAD
err := t.client.NewChangeMarginTypeService().
Symbol(symbol).
MarginType(marginType).
Do(context.Background())
=======
err := t.callWithTimeSync("设置仓位模式", func() error {
return t.client.NewChangeMarginTypeService().
Symbol(symbol).
MarginType(marginType).
Do(context.Background())
})
>>>>>>> pr-313-time-sync
marginModeStr := "全仓"
if !isCrossMargin {