merge: Resolve conflicts with nofxaios/dev (keep our features)

Browse Source

## Conflicts Resolved | 已解决冲突

### api/server.go
- ✅ Kept our feature: Query actual exchange balance when creating trader
- ✅ Kept our feature: SystemPromptTemplate support
- ✅ Kept our feature: scan_interval_minutes configuration
- Applied go fmt for consistent code style

### manager/trader_manager.go
- ✅ Kept our feature: newsCfg parameter (Telegram news integration)
- Applied go fmt for consistent code style

### trader/binance_futures.go
- ✅ Kept our feature: CancelStopOrders method (critical for partial close & dynamic TP/SL)
- ✅ Kept our feature: callWithTimeSync wrapper (Binance time sync for -1021 errors)
- Applied go fmt for consistent code style

## Verification | 验证

All critical features preserved:
- ✅ CancelStopOrders method: 1 occurrence
- ✅ SystemPromptTemplate: 9 occurrences
- ✅ scan_interval_minutes: 3 occurrences
- ✅ callWithTimeSync: 13 occurrences
- ✅ newsCfg: 9 occurrences
- ✅ Code compiles successfully
- ✅ go vet passes without warnings
- ✅ File line counts preserved (776 lines in binance_futures.go)

Backup created at: z-dev-backup-20251104-015939

...

This commit is contained in:

ZhouYongyou

2025-11-04 02:05:55 +08:00

parent b612e80ff9 4166776fdf

commit face7b367c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available