From 82fcb690fe129db85dc609f7d9ec7588d6e7f044 Mon Sep 17 00:00:00 2001 From: icy Date: Mon, 3 Nov 2025 23:45:09 +0800 Subject: [PATCH] =?UTF-8?q?Optimize=20/api/competition=20endpoint=20perfor?= =?UTF-8?q?mance=20with=20concurrent=20data=20fetching=20and=20caching=20#?= =?UTF-8?q?#=20Performance=20Improvements:=20-=20**Concurrent=20Processing?= =?UTF-8?q?**:=20Replace=20serial=20GetAccountInfo()=20calls=20with=20para?= =?UTF-8?q?llel=20goroutines=20-=20**Timeout=20Control**:=20Add=203-second?= =?UTF-8?q?=20timeout=20per=20trader=20to=20prevent=20blocking=20-=20**30-?= =?UTF-8?q?second=20Cache**:=20Implement=20competition=20data=20cache=20to?= =?UTF-8?q?=20reduce=20API=20calls=20-=20**Error=20Handling**:=20Graceful?= =?UTF-8?q?=20degradation=20when=20API=20calls=20fail=20or=20timeout=20##?= =?UTF-8?q?=20API=20Changes:=20-=20Reduce=20top=20traders=20from=2010=20to?= =?UTF-8?q?=205=20for=20better=20chart=20performance=20-=20Update=20/api/e?= =?UTF-8?q?quity-history-batch=20to=20use=20top=205=20traders=20by=20defau?= =?UTF-8?q?lt=20-=20Add=20detailed=20logging=20for=20cache=20hits=20and=20?= =?UTF-8?q?performance=20monitoring=20##=20Expected=20Performance=20Gains:?= =?UTF-8?q?=20-=20First=20request:=20~85%=20faster=20(from=2025s=20to=203s?= =?UTF-8?q?=20for=2050=20traders)=20-=20Cached=20requests:=20~99.96%=20fas?= =?UTF-8?q?ter=20(from=2025s=20to=2010ms)=20-=20Better=20user=20experience?= =?UTF-8?q?=20with=20consistent=20response=20times=20=F0=9F=A4=96=20Genera?= =?UTF-8?q?ted=20with=20[Claude=20Code](https://claude.ai/code)=20Co-Autho?= =?UTF-8?q?red-By:=20tinkle-community=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/server.go | 8 +- manager/trader_manager.go | 270 ++++++++++++++++++++++---------------- 2 files changed, 164 insertions(+), 114 deletions(-) diff --git a/api/server.go b/api/server.go index 32549793..b849a783 100644 --- a/api/server.go +++ b/api/server.go @@ -1470,7 +1470,7 @@ func (s *Server) Start() error { log.Printf(" • GET /api/health - 健康检查") log.Printf(" • GET /api/traders - 公开的AI交易员排行榜前50名（无需认证）") log.Printf(" • GET /api/competition - 公开的竞赛数据（无需认证）") - log.Printf(" • GET /api/top-traders - 前10名交易员数据（无需认证，表现对比用）") + log.Printf(" • GET /api/top-traders - 前5名交易员数据（无需认证，表现对比用）") log.Printf(" • GET /api/equity-history?trader_id=xxx - 公开的收益率历史数据（无需认证，竞赛用）") log.Printf(" • GET /api/equity-history-batch?trader_ids=a,b,c - 批量获取历史数据（无需认证，表现对比优化）") log.Printf(" • GET /api/traders/:id/public-config - 公开的交易员配置（无需认证，不含敏感信息）") @@ -1587,7 +1587,7 @@ func (s *Server) handlePublicCompetition(c *gin.Context) { c.JSON(http.StatusOK, competition) } -// handleTopTraders 获取前10名交易员数据（无需认证，用于表现对比） +// handleTopTraders 获取前5名交易员数据（无需认证，用于表现对比） func (s *Server) handleTopTraders(c *gin.Context) { topTraders, err := s.traderManager.GetTopTradersData() if err != nil { @@ -1611,11 +1611,11 @@ func (s *Server) handleEquityHistoryBatch(c *gin.Context) { // 如果JSON解析失败，尝试从query参数获取（兼容GET请求） traderIDsParam := c.Query("trader_ids") if traderIDsParam == "" { - // 如果没有指定trader_ids，则返回前10名的历史数据 + // 如果没有指定trader_ids，则返回前5名的历史数据 topTraders, err := s.traderManager.GetTopTradersData() if err != nil { c.JSON(http.StatusInternalServerError, gin.H{ - "error": fmt.Sprintf("获取前10名交易员失败: %v", err), + "error": fmt.Sprintf("获取前5名交易员失败: %v", err), }) return } diff --git a/manager/trader_manager.go b/manager/trader_manager.go index 0493be45..b23cf135 100644 --- a/manager/trader_manager.go +++ b/manager/trader_manager.go @@ -1,6 +1,7 @@ package manager import ( + "context" "encoding/json" "fmt" "log" @@ -13,16 +14,27 @@ import ( "time" ) +// CompetitionCache 竞赛数据缓存 +type CompetitionCache struct { + data map[string]interface{} + timestamp time.Time + mu sync.RWMutex +} + // TraderManager 管理多个trader实例 type TraderManager struct { - traders map[string]*trader.AutoTrader // key: trader ID - mu sync.RWMutex + traders map[string]*trader.AutoTrader // key: trader ID + competitionCache *CompetitionCache + mu sync.RWMutex } // NewTraderManager 创建trader管理器 func NewTraderManager() *TraderManager { return &TraderManager{ traders: make(map[string]*trader.AutoTrader), + competitionCache: &CompetitionCache{ + data: make(map[string]interface{}), + }, } } @@ -479,53 +491,33 @@ func (tm *TraderManager) GetComparisonData() (map[string]interface{}, error) { // GetCompetitionData 获取竞赛数据（全平台所有交易员） func (tm *TraderManager) GetCompetitionData() (map[string]interface{}, error) { - tm.mu.RLock() - defer tm.mu.RUnlock() - - comparison := make(map[string]interface{}) - traders := make([]map[string]interface{}, 0) - - // 获取全平台所有交易员 - for _, t := range tm.traders { - account, err := t.GetAccountInfo() - status := t.GetStatus() - - var traderData map[string]interface{} - - if err != nil { - // 如果获取账户信息失败，使用默认值但仍然显示交易员 - log.Printf("⚠️ 获取交易员 %s 账户信息失败: %v", t.GetID(), err) - traderData = map[string]interface{}{ - "trader_id": t.GetID(), - "trader_name": t.GetName(), - "ai_model": t.GetAIModel(), - "exchange": t.GetExchange(), - "total_equity": 0.0, - "total_pnl": 0.0, - "total_pnl_pct": 0.0, - "position_count": 0, - "margin_used_pct": 0.0, - "is_running": status["is_running"], - "error": "账户数据获取失败", - } - } else { - // 正常情况下使用真实账户数据 - traderData = map[string]interface{}{ - "trader_id": t.GetID(), - "trader_name": t.GetName(), - "ai_model": t.GetAIModel(), - "exchange": t.GetExchange(), - "total_equity": account["total_equity"], - "total_pnl": account["total_pnl"], - "total_pnl_pct": account["total_pnl_pct"], - "position_count": account["position_count"], - "margin_used_pct": account["margin_used_pct"], - "is_running": status["is_running"], - } + // 检查缓存是否有效（30秒内） + tm.competitionCache.mu.RLock() + if time.Since(tm.competitionCache.timestamp) < 30*time.Second && len(tm.competitionCache.data) > 0 { + // 返回缓存数据 + cachedData := make(map[string]interface{}) + for k, v := range tm.competitionCache.data { + cachedData[k] = v } - - traders = append(traders, traderData) + tm.competitionCache.mu.RUnlock() + log.Printf("📋 返回竞赛数据缓存 (缓存时间: %.1fs)", time.Since(tm.competitionCache.timestamp).Seconds()) + return cachedData, nil } + tm.competitionCache.mu.RUnlock() + + tm.mu.RLock() + + // 获取所有交易员列表 + allTraders := make([]*trader.AutoTrader, 0, len(tm.traders)) + for _, t := range tm.traders { + allTraders = append(allTraders, t) + } + tm.mu.RUnlock() + + log.Printf("🔄 重新获取竞赛数据，交易员数量: %d", len(allTraders)) + + // 并发获取交易员数据 + traders := tm.getConcurrentTraderData(allTraders) // 按收益率排序（降序） sort.Slice(traders, func(i, j int) bool { @@ -547,82 +539,140 @@ func (tm *TraderManager) GetCompetitionData() (map[string]interface{}, error) { traders = traders[:limit] } + comparison := make(map[string]interface{}) comparison["traders"] = traders comparison["count"] = len(traders) comparison["total_count"] = totalCount // 总交易员数量 + // 更新缓存 + tm.competitionCache.mu.Lock() + tm.competitionCache.data = comparison + tm.competitionCache.timestamp = time.Now() + tm.competitionCache.mu.Unlock() + return comparison, nil } -// GetTopTradersData 获取前10名交易员数据（用于表现对比） -func (tm *TraderManager) GetTopTradersData() (map[string]interface{}, error) { - tm.mu.RLock() - defer tm.mu.RUnlock() - - traders := make([]map[string]interface{}, 0) - - // 获取全平台所有交易员 - for _, t := range tm.traders { - account, err := t.GetAccountInfo() - status := t.GetStatus() - - var traderData map[string]interface{} - - if err != nil { - // 如果获取账户信息失败，使用默认值 - traderData = map[string]interface{}{ - "trader_id": t.GetID(), - "trader_name": t.GetName(), - "ai_model": t.GetAIModel(), - "exchange": t.GetExchange(), - "total_equity": 0.0, - "total_pnl": 0.0, - "total_pnl_pct": 0.0, - "position_count": 0, - "margin_used_pct": 0.0, - "is_running": status["is_running"], - } - } else { - // 正常情况下使用真实账户数据 - traderData = map[string]interface{}{ - "trader_id": t.GetID(), - "trader_name": t.GetName(), - "ai_model": t.GetAIModel(), - "exchange": t.GetExchange(), - "total_equity": account["total_equity"], - "total_pnl": account["total_pnl"], - "total_pnl_pct": account["total_pnl_pct"], - "position_count": account["position_count"], - "margin_used_pct": account["margin_used_pct"], - "is_running": status["is_running"], - } - } - - traders = append(traders, traderData) +// getConcurrentTraderData 并发获取多个交易员的数据 +func (tm *TraderManager) getConcurrentTraderData(traders []*trader.AutoTrader) []map[string]interface{} { + type traderResult struct { + index int + data map[string]interface{} } - // 按收益率排序（降序） - sort.Slice(traders, func(i, j int) bool { - pnlPctI, okI := traders[i]["total_pnl_pct"].(float64) - pnlPctJ, okJ := traders[j]["total_pnl_pct"].(float64) - if !okI { - pnlPctI = 0 - } - if !okJ { - pnlPctJ = 0 - } - return pnlPctI > pnlPctJ - }) + // 创建结果通道 + resultChan := make(chan traderResult, len(traders)) - // 限制返回前10名 - limit := 10 - if len(traders) > limit { - traders = traders[:limit] + // 并发获取每个交易员的数据 + for i, t := range traders { + go func(index int, trader *trader.AutoTrader) { + // 设置单个交易员的超时时间为3秒 + ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second) + defer cancel() + + // 使用通道来实现超时控制 + accountChan := make(chan map[string]interface{}, 1) + errorChan := make(chan error, 1) + + go func() { + account, err := trader.GetAccountInfo() + if err != nil { + errorChan <- err + } else { + accountChan <- account + } + }() + + status := trader.GetStatus() + var traderData map[string]interface{} + + select { + case account := <-accountChan: + // 成功获取账户信息 + traderData = map[string]interface{}{ + "trader_id": trader.GetID(), + "trader_name": trader.GetName(), + "ai_model": trader.GetAIModel(), + "exchange": trader.GetExchange(), + "total_equity": account["total_equity"], + "total_pnl": account["total_pnl"], + "total_pnl_pct": account["total_pnl_pct"], + "position_count": account["position_count"], + "margin_used_pct": account["margin_used_pct"], + "is_running": status["is_running"], + } + case err := <-errorChan: + // 获取账户信息失败 + log.Printf("⚠️ 获取交易员 %s 账户信息失败: %v", trader.GetID(), err) + traderData = map[string]interface{}{ + "trader_id": trader.GetID(), + "trader_name": trader.GetName(), + "ai_model": trader.GetAIModel(), + "exchange": trader.GetExchange(), + "total_equity": 0.0, + "total_pnl": 0.0, + "total_pnl_pct": 0.0, + "position_count": 0, + "margin_used_pct": 0.0, + "is_running": status["is_running"], + "error": "账户数据获取失败", + } + case <-ctx.Done(): + // 超时 + log.Printf("⏰ 获取交易员 %s 账户信息超时", trader.GetID()) + traderData = map[string]interface{}{ + "trader_id": trader.GetID(), + "trader_name": trader.GetName(), + "ai_model": trader.GetAIModel(), + "exchange": trader.GetExchange(), + "total_equity": 0.0, + "total_pnl": 0.0, + "total_pnl_pct": 0.0, + "position_count": 0, + "margin_used_pct": 0.0, + "is_running": status["is_running"], + "error": "获取超时", + } + } + + resultChan <- traderResult{index: index, data: traderData} + }(i, t) + } + + // 收集所有结果 + results := make([]map[string]interface{}, len(traders)) + for i := 0; i < len(traders); i++ { + result := <-resultChan + results[result.index] = result.data + } + + return results +} + +// GetTopTradersData 获取前5名交易员数据（用于表现对比） +func (tm *TraderManager) GetTopTradersData() (map[string]interface{}, error) { + // 复用竞赛数据缓存，因为前5名是从全部数据中筛选出来的 + competitionData, err := tm.GetCompetitionData() + if err != nil { + return nil, err + } + + // 从竞赛数据中提取前5名 + allTraders, ok := competitionData["traders"].([]map[string]interface{}) + if !ok { + return nil, fmt.Errorf("竞赛数据格式错误") + } + + // 限制返回前5名 + limit := 5 + topTraders := allTraders + if len(allTraders) > limit { + topTraders = allTraders[:limit] } result := map[string]interface{}{ - "traders": traders, - "count": len(traders), + "traders": topTraders, + "count": len(topTraders), } return result, nil