liuyu/nofx
1
0
Fork 0
mirror of https://github.com/NoFxAiOS/nofx.git synced 2026-07-16 09:11:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts with dev branch

Browse Source 
Resolved conflicts in:
- api/server.go: Preserved beta_mode config and user permission checks
- manager/trader_manager.go: Kept optimized concurrent competition data with caching

Maintained all performance optimizations while merging new features from dev.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: tinkle-community <tinklefund@gmail.com>
This commit is contained in:
icy
2025-11-04 01:36:54 +08:00
parent f8427f7c91 815c71b2a2
commit 0887f0abd1
7 changed files with 158 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/server.go
View File

@@ -122,8 +122,6 @@ func (s *Server) setupRoutes() {
protected.GET("/user/signal-sources", s.handleGetUserSignalSource) protected.GET("/user/signal-sources", s.handleGetUserSignalSource)
protected.POST("/user/signal-sources", s.handleSaveUserSignalSource) protected.POST("/user/signal-sources", s.handleSaveUserSignalSource)
// 指定trader的数据（使用query参数 ?trader_id=xxx） // 指定trader的数据（使用query参数 ?trader_id=xxx）
protected.GET("/status", s.handleStatus) protected.GET("/status", s.handleStatus)
protected.GET("/account", s.handleAccount) protected.GET("/account", s.handleAccount)