diff --git a/api/server.go b/api/server.go index 92c2f174c..3ed5c699e 100644 --- a/api/server.go +++ b/api/server.go @@ -9,6 +9,7 @@ import ( "nofx/config" "nofx/decision" "nofx/manager" + "nofx/trader" "strconv" "strings" "time" @@ -71,20 +72,20 @@ func (s *Server) setupRoutes() { { // 健康检查 api.Any("/health", s.handleHealth) - + // 认证相关路由（无需认证） api.POST("/register", s.handleRegister) api.POST("/login", s.handleLogin) api.POST("/verify-otp", s.handleVerifyOTP) api.POST("/complete-registration", s.handleCompleteRegistration) - + // 系统支持的模型和交易所（无需认证） api.GET("/supported-models", s.handleGetSupportedModels) api.GET("/supported-exchanges", s.handleGetSupportedExchanges) - + // 系统配置（无需认证） api.GET("/config", s.handleGetSystemConfig) - + // 系统提示词模板管理（无需认证） api.GET("/prompt-templates", s.handleGetPromptTemplates) api.GET("/prompt-templates/:name", s.handleGetPromptTemplate) @@ -114,10 +115,9 @@ func (s *Server) setupRoutes() { protected.GET("/user/signal-sources", s.handleGetUserSignalSource) protected.POST("/user/signal-sources", s.handleSaveUserSignalSource) - // 竞赛总览 protected.GET("/competition", s.handleCompetition) - + // 指定trader的数据（使用query参数 ?trader_id=xxx） protected.GET("/status", s.handleStatus) protected.GET("/account", s.handleAccount) @@ -151,24 +151,24 @@ func (s *Server) handleGetSystemConfig(c *gin.Context) { // 使用硬编码的默认币种 defaultCoins = []string{"BTCUSDT", "ETHUSDT", "SOLUSDT", "BNBUSDT", "XRPUSDT", "DOGEUSDT", "ADAUSDT", "HYPEUSDT"} } - + // 获取杠杆配置 btcEthLeverageStr, _ := s.database.GetSystemConfig("btc_eth_leverage") altcoinLeverageStr, _ := s.database.GetSystemConfig("altcoin_leverage") - + btcEthLeverage := 5 if val, err := strconv.Atoi(btcEthLeverageStr); err == nil && val > 0 { btcEthLeverage = val } - + altcoinLeverage := 5 if val, err := strconv.Atoi(altcoinLeverageStr); err == nil && val > 0 { altcoinLeverage = val } - + c.JSON(http.StatusOK, gin.H{ - "admin_mode": auth.IsAdminMode(), - "default_coins": defaultCoins, + "admin_mode": auth.IsAdminMode(), + "default_coins": defaultCoins, "btc_eth_leverage": btcEthLeverage, "altcoin_leverage": altcoinLeverage, }) @@ -178,20 +178,20 @@ func (s *Server) handleGetSystemConfig(c *gin.Context) { func (s *Server) getTraderFromQuery(c *gin.Context) (*manager.TraderManager, string, error) { userID := c.GetString("user_id") traderID := c.Query("trader_id") - + // 确保用户的交易员已加载到内存中 err := s.traderManager.LoadUserTraders(s.database, userID) if err != nil { log.Printf("⚠️ 加载用户 %s 的交易员失败: %v", userID, err) } - + if traderID == "" { // 如果没有指定trader_id，返回该用户的第一个trader ids := s.traderManager.GetTraderIDs() if len(ids) == 0 { return nil, "", fmt.Errorf("没有可用的trader") } - + // 获取用户的交易员列表，优先返回用户自己的交易员 userTraders, err := s.database.GetTraders(userID) if err == nil && len(userTraders) > 0 { @@ -200,7 +200,7 @@ func (s *Server) getTraderFromQuery(c *gin.Context) (*manager.TraderManager, str traderID = ids[0] } } - + return s.traderManager, traderID, nil } @@ -296,13 +296,13 @@ func (s *Server) handleCreateTrader(c *gin.Context) { // 生成交易员ID traderID := fmt.Sprintf("%s_%s_%d", req.ExchangeID, req.AIModelID, time.Now().Unix()) - + // 设置默认值 isCrossMargin := true // 默认为全仓模式 if req.IsCrossMargin != nil { isCrossMargin = *req.IsCrossMargin } - + // 设置杠杆默认值（从系统配置获取） btcEthLeverage := 5 altcoinLeverage := 5 @@ -326,7 +326,7 @@ func (s *Server) handleCreateTrader(c *gin.Context) { } } } - + // 设置系统提示词模板默认值 systemPromptTemplate := "default" if req.SystemPromptTemplate != "" { @@ -339,14 +339,81 @@ func (s *Server) handleCreateTrader(c *gin.Context) { scanIntervalMinutes = 3 // 默认3分钟 } - // 创建交易员配置（数据库实体） - trader := &config.TraderRecord{ + // ✨ 查询交易所实际余额，覆盖用户输入 + actualBalance := req.InitialBalance // 默认使用用户输入 + exchanges, err := s.database.GetExchanges(userID) + if err != nil { + log.Printf("⚠️ 获取交易所配置失败，使用用户输入的初始资金: %v", err) + } + + // 查找匹配的交易所配置 + var exchangeCfg *config.ExchangeConfig + for _, ex := range exchanges { + if ex.ID == req.ExchangeID { + exchangeCfg = ex + break + } + } + + if exchangeCfg == nil { + log.Printf("⚠️ 未找到交易所 %s 的配置，使用用户输入的初始资金", req.ExchangeID) + } else if !exchangeCfg.Enabled { + log.Printf("⚠️ 交易所 %s 未启用，使用用户输入的初始资金", req.ExchangeID) + } else { + // 根据交易所类型创建临时 trader 查询余额 + var tempTrader trader.Trader + var createErr error + + switch req.ExchangeID { + case "binance": + tempTrader = trader.NewFuturesTrader(exchangeCfg.APIKey, exchangeCfg.SecretKey) + case "hyperliquid": + tempTrader, createErr = trader.NewHyperliquidTrader( + exchangeCfg.APIKey, // private key + exchangeCfg.HyperliquidWalletAddr, + exchangeCfg.Testnet, + ) + case "aster": + tempTrader, createErr = trader.NewAsterTrader( + exchangeCfg.AsterUser, + exchangeCfg.AsterSigner, + exchangeCfg.AsterPrivateKey, + ) + default: + log.Printf("⚠️ 不支持的交易所类型: %s，使用用户输入的初始资金", req.ExchangeID) + } + + if createErr != nil { + log.Printf("⚠️ 创建临时 trader 失败，使用用户输入的初始资金: %v", createErr) + } else if tempTrader != nil { + // 查询实际余额 + balanceInfo, balanceErr := tempTrader.GetBalance() + if balanceErr != nil { + log.Printf("⚠️ 查询交易所余额失败，使用用户输入的初始资金: %v", balanceErr) + } else { + // 提取可用余额 + if availableBalance, ok := balanceInfo["available_balance"].(float64); ok && availableBalance > 0 { + actualBalance = availableBalance + log.Printf("✓ 查询到交易所实际余额: %.2f USDT (用户输入: %.2f USDT)", actualBalance, req.InitialBalance) + } else if totalBalance, ok := balanceInfo["balance"].(float64); ok && totalBalance > 0 { + // 有些交易所可能只返回 balance 字段 + actualBalance = totalBalance + log.Printf("✓ 查询到交易所实际余额: %.2f USDT (用户输入: %.2f USDT)", actualBalance, req.InitialBalance) + } else { + log.Printf("⚠️ 无法从余额信息中提取可用余额，使用用户输入的初始资金") + } + } + } + } + + // 创建交易员配置（数据库实体） + trader := &config.TraderRecord{ ID: traderID, UserID: userID, Name: req.Name, AIModelID: req.AIModelID, ExchangeID: req.ExchangeID, - InitialBalance: req.InitialBalance, + InitialBalance: actualBalance, // 使用实际查询的余额 BTCETHLeverage: btcEthLeverage, AltcoinLeverage: altcoinLeverage, TradingSymbols: req.TradingSymbols, @@ -357,11 +424,11 @@ func (s *Server) handleCreateTrader(c *gin.Context) { SystemPromptTemplate: systemPromptTemplate, IsCrossMargin: isCrossMargin, ScanIntervalMinutes: scanIntervalMinutes, - IsRunning: false, + IsRunning: false, } // 保存到数据库 - err := s.database.CreateTrader(trader) + err = s.database.CreateTrader(trader) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("创建交易员失败: %v", err)}) return @@ -393,17 +460,18 @@ type UpdateTraderRequest struct { ScanIntervalMinutes int `json:"scan_interval_minutes"` BTCETHLeverage int `json:"btc_eth_leverage"` AltcoinLeverage int `json:"altcoin_leverage"` - TradingSymbols string `json:"trading_symbols"` - CustomPrompt string `json:"custom_prompt"` - OverrideBasePrompt bool `json:"override_base_prompt"` - IsCrossMargin *bool `json:"is_cross_margin"` + TradingSymbols string `json:"trading_symbols"` + CustomPrompt string `json:"custom_prompt"` + OverrideBasePrompt bool `json:"override_base_prompt"` + SystemPromptTemplate string `json:"system_prompt_template"` + IsCrossMargin *bool `json:"is_cross_margin"` } // handleUpdateTrader 更新交易员配置 func (s *Server) handleUpdateTrader(c *gin.Context) { userID := c.GetString("user_id") traderID := c.Param("id") - + var req UpdateTraderRequest if err := c.ShouldBindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) @@ -416,7 +484,7 @@ func (s *Server) handleUpdateTrader(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"error": "获取交易员列表失败"}) return } - + var existingTrader *config.TraderRecord for _, trader := range traders { if trader.ID == traderID { @@ -424,7 +492,7 @@ func (s *Server) handleUpdateTrader(c *gin.Context) { break } } - + if existingTrader == nil { c.JSON(http.StatusNotFound, gin.H{"error": "交易员不存在"}) return @@ -435,7 +503,7 @@ func (s *Server) handleUpdateTrader(c *gin.Context) { if req.IsCrossMargin != nil { isCrossMargin = *req.IsCrossMargin } - + // 设置杠杆默认值 btcEthLeverage := req.BTCETHLeverage altcoinLeverage := req.AltcoinLeverage @@ -452,8 +520,14 @@ func (s *Server) handleUpdateTrader(c *gin.Context) { scanIntervalMinutes = existingTrader.ScanIntervalMinutes // 保持原值 } - // 更新交易员配置 - trader := &config.TraderRecord{ + // 设置系统提示词模板，允许更新 + systemPromptTemplate := req.SystemPromptTemplate + if systemPromptTemplate == "" { + systemPromptTemplate = existingTrader.SystemPromptTemplate // 保持原值 + } + + // 更新交易员配置 + trader := &config.TraderRecord{ ID: traderID, UserID: userID, Name: req.Name, @@ -465,7 +539,7 @@ func (s *Server) handleUpdateTrader(c *gin.Context) { TradingSymbols: req.TradingSymbols, CustomPrompt: req.CustomPrompt, OverrideBasePrompt: req.OverrideBasePrompt, - SystemPromptTemplate: existingTrader.SystemPromptTemplate, // 保持原值 + SystemPromptTemplate: systemPromptTemplate, IsCrossMargin: isCrossMargin, ScanIntervalMinutes: scanIntervalMinutes, IsRunning: existingTrader.IsRunning, // 保持原值 @@ -498,14 +572,14 @@ func (s *Server) handleUpdateTrader(c *gin.Context) { func (s *Server) handleDeleteTrader(c *gin.Context) { userID := c.GetString("user_id") traderID := c.Param("id") - + // 从数据库删除 err := s.database.DeleteTrader(userID, traderID) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("删除交易员失败: %v", err)}) return } - + // 如果交易员正在运行，先停止它 if trader, err := s.traderManager.GetTrader(traderID); err == nil { status := trader.GetStatus() @@ -514,7 +588,7 @@ func (s *Server) handleDeleteTrader(c *gin.Context) { log.Printf("⏹ 已停止运行中的交易员: %s", traderID) } } - + log.Printf("✓ 交易员已删除: %s", traderID) c.JSON(http.StatusOK, gin.H{"message": "交易员已删除"}) } @@ -522,20 +596,20 @@ func (s *Server) handleDeleteTrader(c *gin.Context) { // handleStartTrader 启动交易员 func (s *Server) handleStartTrader(c *gin.Context) { traderID := c.Param("id") - + trader, err := s.traderManager.GetTrader(traderID) if err != nil { c.JSON(http.StatusNotFound, gin.H{"error": "交易员不存在"}) return } - + // 检查交易员是否已经在运行 status := trader.GetStatus() if isRunning, ok := status["is_running"].(bool); ok && isRunning { c.JSON(http.StatusBadRequest, gin.H{"error": "交易员已在运行中"}) return } - + // 启动交易员 go func() { log.Printf("▶️ 启动交易员 %s (%s)", traderID, trader.GetName()) @@ -543,14 +617,14 @@ func (s *Server) handleStartTrader(c *gin.Context) { log.Printf("❌ 交易员 %s 运行错误: %v", trader.GetName(), err) } }() - + // 更新数据库中的运行状态 userID := c.GetString("user_id") err = s.database.UpdateTraderStatus(userID, traderID, true) if err != nil { log.Printf("⚠️ 更新交易员状态失败: %v", err) } - + log.Printf("✓ 交易员 %s 已启动", trader.GetName()) c.JSON(http.StatusOK, gin.H{"message": "交易员已启动"}) } @@ -558,30 +632,30 @@ func (s *Server) handleStartTrader(c *gin.Context) { // handleStopTrader 停止交易员 func (s *Server) handleStopTrader(c *gin.Context) { traderID := c.Param("id") - + trader, err := s.traderManager.GetTrader(traderID) if err != nil { c.JSON(http.StatusNotFound, gin.H{"error": "交易员不存在"}) return } - + // 检查交易员是否正在运行 status := trader.GetStatus() if isRunning, ok := status["is_running"].(bool); ok && !isRunning { c.JSON(http.StatusBadRequest, gin.H{"error": "交易员已停止"}) return } - + // 停止交易员 trader.Stop() - + // 更新数据库中的运行状态 userID := c.GetString("user_id") err = s.database.UpdateTraderStatus(userID, traderID, false) if err != nil { log.Printf("⚠️ 更新交易员状态失败: %v", err) } - + log.Printf("⏹ 交易员 %s 已停止", trader.GetName()) c.JSON(http.StatusOK, gin.H{"message": "交易员已停止"}) } @@ -590,24 +664,24 @@ func (s *Server) handleStopTrader(c *gin.Context) { func (s *Server) handleUpdateTraderPrompt(c *gin.Context) { traderID := c.Param("id") userID := c.GetString("user_id") - + var req struct { - CustomPrompt string `json:"custom_prompt"` - OverrideBasePrompt bool `json:"override_base_prompt"` + CustomPrompt string `json:"custom_prompt"` + OverrideBasePrompt bool `json:"override_base_prompt"` } - + if err := c.ShouldBindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) return } - + // 更新数据库 err := s.database.UpdateTraderCustomPrompt(userID, traderID, req.CustomPrompt, req.OverrideBasePrompt) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("更新自定义prompt失败: %v", err)}) return } - + // 如果trader在内存中，更新其custom prompt和override设置 trader, err := s.traderManager.GetTrader(traderID) if err == nil { @@ -615,7 +689,7 @@ func (s *Server) handleUpdateTraderPrompt(c *gin.Context) { trader.SetOverrideBasePrompt(req.OverrideBasePrompt) log.Printf("✓ 已更新交易员 %s 的自定义prompt (覆盖基础=%v)", trader.GetName(), req.OverrideBasePrompt) } - + c.JSON(http.StatusOK, gin.H{"message": "自定义prompt已更新"}) } @@ -630,7 +704,7 @@ func (s *Server) handleGetModelConfigs(c *gin.Context) { return } log.Printf("✅ 找到 %d 个AI模型配置", len(models)) - + c.JSON(http.StatusOK, models) } @@ -674,7 +748,7 @@ func (s *Server) handleGetExchangeConfigs(c *gin.Context) { return } log.Printf("✅ 找到 %d 个交易所配置", len(exchanges)) - + c.JSON(http.StatusOK, exchanges) } @@ -719,7 +793,7 @@ func (s *Server) handleGetUserSignalSource(c *gin.Context) { }) return } - + c.JSON(http.StatusOK, gin.H{ "coin_pool_url": source.CoinPoolURL, "oi_top_url": source.OITopURL, @@ -733,18 +807,18 @@ func (s *Server) handleSaveUserSignalSource(c *gin.Context) { CoinPoolURL string `json:"coin_pool_url"` OITopURL string `json:"oi_top_url"` } - + if err := c.ShouldBindJSON(&req); err != nil { c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) return } - + err := s.database.CreateUserSignalSource(userID, req.CoinPoolURL, req.OITopURL) if err != nil { c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("保存用户信号源配置失败: %v", err)}) return } - + log.Printf("✓ 用户信号源配置已保存: user=%s, coin_pool=%s, oi_top=%s", userID, req.CoinPoolURL, req.OITopURL) c.JSON(http.StatusOK, gin.H{"message": "用户信号源配置已保存"}) } @@ -769,19 +843,12 @@ func (s *Server) handleTraderList(c *gin.Context) { } } - // AIModelID 应该已经是 provider（如 "deepseek"），直接使用 - // 如果是旧数据格式（如 "admin_deepseek"），提取 provider 部分 - aiModelID := trader.AIModelID - // 兼容旧数据：如果包含下划线，提取最后一部分作为 provider - if strings.Contains(aiModelID, "_") { - parts := strings.Split(aiModelID, "_") - aiModelID = parts[len(parts)-1] - } - + // 返回完整的 AIModelID（如 "admin_deepseek"），不要截断 + // 前端需要完整 ID 来验证模型是否存在（与 handleGetTraderConfig 保持一致） result = append(result, map[string]interface{}{ "trader_id": trader.ID, "trader_name": trader.Name, - "ai_model": aiModelID, + "ai_model": trader.AIModelID, // 使用完整 ID "exchange_id": trader.ExchangeID, "is_running": isRunning, "initial_balance": trader.InitialBalance, @@ -816,13 +883,11 @@ func (s *Server) handleGetTraderConfig(c *gin.Context) { } } - // 返回完整的模型ID，不做转换，保持与前端模型列表一致 - aiModelID := traderConfig.AIModelID - + // 返回完整的模型ID，不做转換，保持与前端模型列表一致 result := map[string]interface{}{ "trader_id": traderConfig.ID, "trader_name": traderConfig.Name, - "ai_model": aiModelID, + "ai_model": traderConfig.AIModelID, // 使用完整 ID "exchange_id": traderConfig.ExchangeID, "initial_balance": traderConfig.InitialBalance, "scan_interval_minutes": traderConfig.ScanIntervalMinutes, @@ -831,6 +896,7 @@ func (s *Server) handleGetTraderConfig(c *gin.Context) { "trading_symbols": traderConfig.TradingSymbols, "custom_prompt": traderConfig.CustomPrompt, "override_base_prompt": traderConfig.OverrideBasePrompt, + "system_prompt_template": traderConfig.SystemPromptTemplate, "is_cross_margin": traderConfig.IsCrossMargin, "use_coin_pool": traderConfig.UseCoinPool, "use_oi_top": traderConfig.UseOITop, @@ -1001,13 +1067,13 @@ func (s *Server) handleStatistics(c *gin.Context) { // handleCompetition 竞赛总览（对比所有trader） func (s *Server) handleCompetition(c *gin.Context) { userID := c.GetString("user_id") - + // 确保用户的交易员已加载到内存中 err := s.traderManager.LoadUserTraders(s.database, userID) if err != nil { log.Printf("⚠️ 加载用户 %s 的交易员失败: %v", userID, err) } - + competition, err := s.traderManager.GetCompetitionData() if err != nil { c.JSON(http.StatusInternalServerError, gin.H{ @@ -1015,7 +1081,7 @@ func (s *Server) handleCompetition(c *gin.Context) { }) return } - + c.JSON(http.StatusOK, competition) } @@ -1142,7 +1208,7 @@ func (s *Server) authMiddleware() gin.HandlerFunc { c.Next() return } - + authHeader := c.GetHeader("Authorization") if authHeader == "" { c.JSON(http.StatusUnauthorized, gin.H{"error": "缺少Authorization头"}) @@ -1225,11 +1291,11 @@ func (s *Server) handleRegister(c *gin.Context) { // 返回OTP设置信息 qrCodeURL := auth.GetOTPQRCodeURL(otpSecret, req.Email) c.JSON(http.StatusOK, gin.H{ - "user_id": userID, - "email": req.Email, - "otp_secret": otpSecret, + "user_id": userID, + "email": req.Email, + "otp_secret": otpSecret, "qr_code_url": qrCodeURL, - "message": "请使用Google Authenticator扫描二维码并验证OTP", + "message": "请使用Google Authenticator扫描二维码并验证OTP", }) } @@ -1314,8 +1380,8 @@ func (s *Server) handleLogin(c *gin.Context) { // 检查OTP是否已验证 if !user.OTPVerified { c.JSON(http.StatusUnauthorized, gin.H{ - "error": "账户未完成OTP设置", - "user_id": user.ID, + "error": "账户未完成OTP设置", + "user_id": user.ID, "requires_otp_setup": true, }) return @@ -1323,9 +1389,9 @@ func (s *Server) handleLogin(c *gin.Context) { // 返回需要OTP验证的状态 c.JSON(http.StatusOK, gin.H{ - "user_id": user.ID, - "email": user.Email, - "message": "请输入Google Authenticator验证码", + "user_id": user.ID, + "email": user.Email, + "message": "请输入Google Authenticator验证码", "requires_otp": true, }) } @@ -1387,7 +1453,7 @@ func (s *Server) handleGetSupportedModels(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"error": "获取支持的AI模型失败"}) return } - + c.JSON(http.StatusOK, models) } @@ -1400,7 +1466,7 @@ func (s *Server) handleGetSupportedExchanges(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"error": "获取支持的交易所失败"}) return } - + c.JSON(http.StatusOK, exchanges) } @@ -1436,7 +1502,7 @@ func (s *Server) Start() error { func (s *Server) handleGetPromptTemplates(c *gin.Context) { // 导入 decision 包 templates := decision.GetAllPromptTemplates() - + // 转换为响应格式 response := make([]map[string]interface{}, 0, len(templates)) for _, tmpl := range templates { @@ -1444,7 +1510,7 @@ func (s *Server) handleGetPromptTemplates(c *gin.Context) { "name": tmpl.Name, }) } - + c.JSON(http.StatusOK, gin.H{ "templates": response, }) @@ -1453,13 +1519,13 @@ func (s *Server) handleGetPromptTemplates(c *gin.Context) { // handleGetPromptTemplate 获取指定名称的提示词模板内容 func (s *Server) handleGetPromptTemplate(c *gin.Context) { templateName := c.Param("name") - + template, err := decision.GetPromptTemplate(templateName) if err != nil { c.JSON(http.StatusNotFound, gin.H{"error": fmt.Sprintf("模板不存在: %s", templateName)}) return } - + c.JSON(http.StatusOK, gin.H{ "name": template.Name, "content": template.Content, diff --git a/auth/auth.go b/auth/auth.go index 685d08e65..89c58e5c5 100644 --- a/auth/auth.go +++ b/auth/auth.go @@ -61,7 +61,7 @@ func GenerateOTPSecret() (string, error) { if err != nil { return "", err } - + key, err := totp.Generate(totp.GenerateOpts{ Issuer: OTPIssuer, AccountName: uuid.New().String(), @@ -69,7 +69,7 @@ func GenerateOTPSecret() (string, error) { if err != nil { return "", err } - + return key.Secret(), nil } @@ -118,4 +118,4 @@ func ValidateJWT(tokenString string) (*Claims, error) { // GetOTPQRCodeURL 获取OTP二维码URL func GetOTPQRCodeURL(secret, email string) string { return fmt.Sprintf("otpauth://totp/%s:%s?secret=%s&issuer=%s", OTPIssuer, email, secret, OTPIssuer) -} \ No newline at end of file +} diff --git a/config.json.example b/config.json.example index ac9d5ac66..138324df4 100644 --- a/config.json.example +++ b/config.json.example @@ -15,9 +15,28 @@ "ADAUSDT", "HYPEUSDT" ], + "coin_pool_api_url": "", + "oi_top_api_url": "", "api_server_port": 8080, "max_daily_loss": 10.0, "max_drawdown": 20.0, "stop_trading_minutes": 60, - "jwt_secret": "Qk0kAa+d0iIEzXVHXbNbm+UaN3RNabmWtH8rDWZ5OPf+4GX8pBflAHodfpbipVMyrw1fsDanHsNBjhgbDeK9Jg==" + "jwt_secret": "Qk0kAa+d0iIEzXVHXbNbm+UaN3RNabmWtH8rDWZ5OPf+4GX8pBflAHodfpbipVMyrw1fsDanHsNBjhgbDeK9Jg==", + // 建议使用时删除,目前新闻源功能还比较初级 + "news": [ + { + "provider": "telegram", + "telegram": { + // 国外服务器无需配置 + "proxyurl": "http://127.0.0.1:18080" + }, + "channels": [ + { + // 如t.me/ChannelPANews,id为ChannelPANews + "id": "ChannelPANews", + "name": "PANews" + } + ] + } + ] } \ No newline at end of file diff --git a/config/database.go b/config/database.go index 1102c6fb5..d6fdc30c6 100644 --- a/config/database.go +++ b/config/database.go @@ -435,6 +435,25 @@ type UserSignalSource struct { UpdatedAt time.Time `json:"updated_at"` } +// NewsConfig 新闻配置 +type NewsConfig struct { + Provider string `json:"provider"` // 新闻搜索器名称: telegram + Telegram NewsConfigTelegram `json:"telegram"` // telegram客户端配置 + TelegramChannel []NewsConfigTelegramChannel `json:"channels"` // telegram频道配置 +} + +// NewsConfigTelegram telegram配置 +type NewsConfigTelegram struct { + BaseURL string `json:"baseurl"` // 基础url + ProxyURL string `json:"proxyurl"` // 代理url +} + +// NewsConfigTelegramChannel 电报频道配置 +type NewsConfigTelegramChannel struct { + ID string `json:"id"` // 频道id + Name string `json:"name"` // 频道名称 +} + // GenerateOTPSecret 生成OTP密钥 func GenerateOTPSecret() (string, error) { secret := make([]byte, 20) @@ -857,9 +876,22 @@ func (d *Database) GetTraderConfig(userID, traderID string) (*TraderRecord, *AIM var exchange ExchangeConfig err := d.db.QueryRow(` - SELECT - t.id, t.user_id, t.name, t.ai_model_id, t.exchange_id, t.initial_balance, t.scan_interval_minutes, t.is_running, t.created_at, t.updated_at, - a.id, a.user_id, a.name, a.provider, a.enabled, a.api_key, a.created_at, a.updated_at, + SELECT + t.id, t.user_id, t.name, t.ai_model_id, t.exchange_id, t.initial_balance, t.scan_interval_minutes, t.is_running, + COALESCE(t.btc_eth_leverage, 5) as btc_eth_leverage, + COALESCE(t.altcoin_leverage, 5) as altcoin_leverage, + COALESCE(t.trading_symbols, '') as trading_symbols, + COALESCE(t.use_coin_pool, 0) as use_coin_pool, + COALESCE(t.use_oi_top, 0) as use_oi_top, + COALESCE(t.custom_prompt, '') as custom_prompt, + COALESCE(t.override_base_prompt, 0) as override_base_prompt, + COALESCE(t.system_prompt_template, 'default') as system_prompt_template, + COALESCE(t.is_cross_margin, 1) as is_cross_margin, + t.created_at, t.updated_at, + a.id, a.user_id, a.name, a.provider, a.enabled, a.api_key, + COALESCE(a.custom_api_url, '') as custom_api_url, + COALESCE(a.custom_model_name, '') as custom_model_name, + a.created_at, a.updated_at, e.id, e.user_id, e.name, e.type, e.enabled, e.api_key, e.secret_key, e.testnet, COALESCE(e.hyperliquid_wallet_addr, '') as hyperliquid_wallet_addr, COALESCE(e.aster_user, '') as aster_user, @@ -873,8 +905,13 @@ func (d *Database) GetTraderConfig(userID, traderID string) (*TraderRecord, *AIM `, traderID, userID).Scan( &trader.ID, &trader.UserID, &trader.Name, &trader.AIModelID, &trader.ExchangeID, &trader.InitialBalance, &trader.ScanIntervalMinutes, &trader.IsRunning, + &trader.BTCETHLeverage, &trader.AltcoinLeverage, &trader.TradingSymbols, + &trader.UseCoinPool, &trader.UseOITop, + &trader.CustomPrompt, &trader.OverrideBasePrompt, &trader.SystemPromptTemplate, + &trader.IsCrossMargin, &trader.CreatedAt, &trader.UpdatedAt, &aiModel.ID, &aiModel.UserID, &aiModel.Name, &aiModel.Provider, &aiModel.Enabled, &aiModel.APIKey, + &aiModel.CustomAPIURL, &aiModel.CustomModelName, &aiModel.CreatedAt, &aiModel.UpdatedAt, &exchange.ID, &exchange.UserID, &exchange.Name, &exchange.Type, &exchange.Enabled, &exchange.APIKey, &exchange.SecretKey, &exchange.Testnet, diff --git a/decision/engine.go b/decision/engine.go index df48d5343..eea3e4a4c 100644 --- a/decision/engine.go +++ b/decision/engine.go @@ -6,9 +6,12 @@ import ( "log" "nofx/market" "nofx/mcp" + "nofx/news" "nofx/pool" "strings" "time" + + "github.com/samber/lo" ) // PositionInfo 持仓信息 @@ -55,30 +58,40 @@ type OITopData struct { // Context 交易上下文（传递给AI的完整信息） type Context struct { - CurrentTime string `json:"current_time"` - RuntimeMinutes int `json:"runtime_minutes"` - CallCount int `json:"call_count"` - Account AccountInfo `json:"account"` - Positions []PositionInfo `json:"positions"` - CandidateCoins []CandidateCoin `json:"candidate_coins"` - MarketDataMap map[string]*market.Data `json:"-"` // 不序列化，但内部使用 - OITopDataMap map[string]*OITopData `json:"-"` // OI Top数据映射 - Performance interface{} `json:"-"` // 历史表现分析（logger.PerformanceAnalysis） - BTCETHLeverage int `json:"-"` // BTC/ETH杠杆倍数（从配置读取） - AltcoinLeverage int `json:"-"` // 山寨币杠杆倍数（从配置读取） + CurrentTime string `json:"current_time"` + RuntimeMinutes int `json:"runtime_minutes"` + CallCount int `json:"call_count"` + Account AccountInfo `json:"account"` + Positions []PositionInfo `json:"positions"` + CandidateCoins []CandidateCoin `json:"candidate_coins"` + MarketDataMap map[string]*market.Data `json:"-"` // 不序列化，但内部使用 + OITopDataMap map[string]*OITopData `json:"-"` // OI Top数据映射 + Performance interface{} `json:"-"` // 历史表现分析（logger.PerformanceAnalysis） + BTCETHLeverage int `json:"-"` // BTC/ETH杠杆倍数（从配置读取） + AltcoinLeverage int `json:"-"` // 山寨币杠杆倍数（从配置读取） + News map[string][]news.NewsItem `json:"news,omitempty"` // 新闻数据（可选）按symbol分组传给AI } // Decision AI的交易决策 type Decision struct { - Symbol string `json:"symbol"` - Action string `json:"action"` // "open_long", "open_short", "close_long", "close_short", "hold", "wait" + Symbol string `json:"symbol"` + Action string `json:"action"` // "open_long", "open_short", "close_long", "close_short", "update_stop_loss", "update_take_profit", "partial_close", "hold", "wait" + + // 开仓参数 Leverage int `json:"leverage,omitempty"` PositionSizeUSD float64 `json:"position_size_usd,omitempty"` StopLoss float64 `json:"stop_loss,omitempty"` TakeProfit float64 `json:"take_profit,omitempty"` - Confidence int `json:"confidence,omitempty"` // 信心度 (0-100) - RiskUSD float64 `json:"risk_usd,omitempty"` // 最大美元风险 - Reasoning string `json:"reasoning"` + + // 调整参数（新增） + NewStopLoss float64 `json:"new_stop_loss,omitempty"` // 用于 update_stop_loss + NewTakeProfit float64 `json:"new_take_profit,omitempty"` // 用于 update_take_profit + ClosePercentage float64 `json:"close_percentage,omitempty"` // 用于 partial_close (0-100) + + // 通用参数 + Confidence int `json:"confidence,omitempty"` // 信心度 (0-100) + RiskUSD float64 `json:"risk_usd,omitempty"` // 最大美元风险 + Reasoning string `json:"reasoning"` } // FullDecision AI的完整决策（包含思维链） @@ -114,13 +127,18 @@ func GetFullDecisionWithCustomPrompt(ctx *Context, mcpClient *mcp.Client, custom // 4. 解析AI响应 decision, err := parseFullDecisionResponse(aiResponse, ctx.Account.TotalEquity, ctx.BTCETHLeverage, ctx.AltcoinLeverage) + + // 无论是否有错误，都要保存 SystemPrompt 和 UserPrompt（用于调试和决策未执行后的问题定位） + if decision != nil { + decision.Timestamp = time.Now() + decision.SystemPrompt = systemPrompt // 保存系统prompt + decision.UserPrompt = userPrompt // 保存输入prompt + } + if err != nil { return decision, fmt.Errorf("解析AI响应失败: %w", err) } - decision.Timestamp = time.Now() - decision.SystemPrompt = systemPrompt // 保存系统prompt - decision.UserPrompt = userPrompt // 保存输入prompt return decision, nil } @@ -248,7 +266,7 @@ func buildSystemPrompt(accountEquity float64, btcEthLeverage, altcoinLeverage in log.Printf("⚠️ 提示词模板 '%s' 不存在，使用 default: %v", templateName, err) template, err = GetPromptTemplate("default") if err != nil { - // 如果连 default 都不存在，使用内置的简化版本 + // 如果连 default 都不存在，使用内置的简化版本（最后防线） log.Printf("❌ 无法加载任何提示词模板，使用内置简化版本") sb.WriteString("你是专业的加密货币交易AI。请根据市场数据做出交易决策。\n\n") } else { @@ -260,15 +278,16 @@ func buildSystemPrompt(accountEquity float64, btcEthLeverage, altcoinLeverage in sb.WriteString("\n\n") } - // 2. 硬约束（风险控制）- 动态生成 + // 2. 硬约束（风险控制）- 动态生成（始终追加） sb.WriteString("# 硬约束（风险控制）\n\n") sb.WriteString("1. 风险回报比: 必须 ≥ 1:3（冒1%风险，赚3%+收益）\n") sb.WriteString("2. 最多持仓: 3个币种（质量>数量）\n") - sb.WriteString(fmt.Sprintf("3. 单币仓位: 山寨%.0f-%.0f U(%dx杠杆) | BTC/ETH %.0f-%.0f U(%dx杠杆)\n", - accountEquity*0.8, accountEquity*1.5, altcoinLeverage, accountEquity*5, accountEquity*10, btcEthLeverage)) - sb.WriteString("4. 保证金: 总使用率 ≤ 90%\n\n") + sb.WriteString(fmt.Sprintf("3. 单币仓位: 山寨%.0f-%.0f U | BTC/ETH %.0f-%.0f U\n", + accountEquity*0.8, accountEquity*1.5, accountEquity*5, accountEquity*10)) + sb.WriteString(fmt.Sprintf("4. 杠杆限制: **山寨币最大%dx杠杆** | **BTC/ETH最大%dx杠杆** (⚠️ 严格执行，不可超过)\n", altcoinLeverage, btcEthLeverage)) + sb.WriteString("5. 保证金: 总使用率 ≤ 90%\n\n") - // 3. 输出格式 - 动态生成 + // 3. 输出格式 - 动态生成（始终追加） sb.WriteString("#输出格式\n\n") sb.WriteString("第一步: 思维链（纯文本）\n") sb.WriteString("简洁分析你的思考过程\n\n") @@ -278,9 +297,12 @@ func buildSystemPrompt(accountEquity float64, btcEthLeverage, altcoinLeverage in sb.WriteString(" {\"symbol\": \"ETHUSDT\", \"action\": \"close_long\", \"reasoning\": \"止盈离场\"}\n") sb.WriteString("]\n```\n\n") sb.WriteString("字段说明:\n") - sb.WriteString("- `action`: open_long | open_short | close_long | close_short | hold | wait\n") + sb.WriteString("- `action`: open_long | open_short | close_long | close_short | update_stop_loss | update_take_profit | partial_close | hold | wait\n") sb.WriteString("- `confidence`: 0-100（开仓建议≥75）\n") - sb.WriteString("- 开仓时必填: leverage, position_size_usd, stop_loss, take_profit, confidence, risk_usd, reasoning\n\n") + sb.WriteString("- 开仓时必填: leverage, position_size_usd, stop_loss, take_profit, confidence, risk_usd, reasoning\n") + sb.WriteString("- update_stop_loss 必填: new_stop_loss, reasoning\n") + sb.WriteString("- update_take_profit 必填: new_take_profit, reasoning\n") + sb.WriteString("- partial_close 必填: close_percentage (0-100), reasoning\n\n") return sb.String() } @@ -380,6 +402,18 @@ func buildUserPrompt(ctx *Context) string { } } + // 新闻内容 + newsItem := make([]news.NewsItem, 0, 100) + for _, symbol := range lo.Keys(ctx.News) { + newsItem = append(newsItem, ctx.News[symbol]...) + } + if len(newsItem) > 0 { + sb.WriteString("\n## 相关新闻\n") + for _, item := range newsItem { + sb.WriteString(item.String()) + } + } + sb.WriteString("---\n\n") sb.WriteString("现在请分析并输出决策（思维链 + JSON）\n") @@ -504,12 +538,15 @@ func findMatchingBracket(s string, start int) int { func validateDecision(d *Decision, accountEquity float64, btcEthLeverage, altcoinLeverage int) error { // 验证action validActions := map[string]bool{ - "open_long": true, - "open_short": true, - "close_long": true, - "close_short": true, - "hold": true, - "wait": true, + "open_long": true, + "open_short": true, + "close_long": true, + "close_short": true, + "update_stop_loss": true, + "update_take_profit": true, + "partial_close": true, + "hold": true, + "wait": true, } if !validActions[d.Action] { @@ -589,5 +626,26 @@ func validateDecision(d *Decision, accountEquity float64, btcEthLeverage, altcoi } } + // 动态调整止损验证 + if d.Action == "update_stop_loss" { + if d.NewStopLoss <= 0 { + return fmt.Errorf("新止损价格必须大于0: %.2f", d.NewStopLoss) + } + } + + // 动态调整止盈验证 + if d.Action == "update_take_profit" { + if d.NewTakeProfit <= 0 { + return fmt.Errorf("新止盈价格必须大于0: %.2f", d.NewTakeProfit) + } + } + + // 部分平仓验证 + if d.Action == "partial_close" { + if d.ClosePercentage <= 0 || d.ClosePercentage > 100 { + return fmt.Errorf("平仓百分比必须在0-100之间: %.1f", d.ClosePercentage) + } + } + return nil } diff --git a/docker-compose.yml b/docker-compose.yml index e2f6c905b..7c2b32076 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,19 @@ services: + # Init service: ensure config.db file exists before backend starts + config-init: + image: busybox:1.36 + command: + - sh + - -c + - > + touch /mnt/config.db && + if [ ! -f /mnt/config.json ] && [ -f /mnt/config.json.example ]; then + cp /mnt/config.json.example /mnt/config.json; + fi + volumes: + - ./:/mnt + restart: "no" + # Backend service (API and core logic) nofx: build: @@ -18,6 +33,9 @@ services: - TZ=${NOFX_TIMEZONE:-Asia/Shanghai} # Set timezone networks: - nofx-network + depends_on: + config-init: + condition: service_completed_successfully healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/api/health"] interval: 30s @@ -47,4 +65,4 @@ services: networks: nofx-network: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/go.mod b/go.mod index 067172fd0..c8377cf68 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module nofx go 1.25.0 require ( + github.com/PuerkitoBio/goquery v1.10.3 github.com/adshao/go-binance/v2 v2.8.7 github.com/ethereum/go-ethereum v1.16.5 github.com/gin-gonic/gin v1.11.0 @@ -11,11 +12,13 @@ require ( github.com/gorilla/websocket v1.5.3 github.com/mattn/go-sqlite3 v1.14.16 github.com/pquerna/otp v1.4.0 + github.com/samber/lo v1.52.0 github.com/sonirico/go-hyperliquid v0.17.0 golang.org/x/crypto v0.42.0 ) require ( + github.com/andybalholm/cascadia v1.3.3 // indirect github.com/armon/go-radix v1.0.0 // indirect github.com/bitly/go-simplejson v0.5.0 // indirect github.com/bits-and-blooms/bitset v1.24.0 // indirect diff --git a/go.sum b/go.sum index a18e56afd..56adab225 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,11 @@ +github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo= +github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/adshao/go-binance/v2 v2.8.7 h1:n7jkhwIHMdtd/9ZU2gTqFV15XVSbUCjyFlOUAtTd8uU= github.com/adshao/go-binance/v2 v2.8.7/go.mod h1:XkkuecSyJKPolaCGf/q4ovJYB3t0P+7RUYTbGr+LMGM= +github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= +github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= @@ -76,6 +80,7 @@ github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -155,6 +160,8 @@ github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY= github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ= +github.com/samber/lo v1.52.0 h1:Rvi+3BFHES3A8meP33VPAxiBZX/Aws5RxrschYGjomw= +github.com/samber/lo v1.52.0/go.mod h1:4+MXEGsJzbKGaUEQFKBq2xtfuznW9oz/WrgyzMzRoM0= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= @@ -192,6 +199,7 @@ github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IU github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.elastic.co/apm/module/apmzerolog/v2 v2.7.1 h1:C9+KrlqS8F4SZFu+ct0Jmv2YLmzDhWsI8htK6exd3vg= go.elastic.co/apm/module/apmzerolog/v2 v2.7.1/go.mod h1:wXViB7paxMUrERgZrmUb+0FCqgb13Dull1JOOd8Hcj0= go.elastic.co/apm/v2 v2.7.1 h1:OFjARuESjBsxw7wHrEAnfSVNCHGBATXSI/kPvBARY/A= @@ -202,23 +210,85 @@ go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c= golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ= golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE= golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg= golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw= google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/logger/decision_logger.go b/logger/decision_logger.go index efa5ab741..842783bae 100644 --- a/logger/decision_logger.go +++ b/logger/decision_logger.go @@ -50,9 +50,9 @@ type PositionSnapshot struct { // DecisionAction 决策动作 type DecisionAction struct { - Action string `json:"action"` // open_long, open_short, close_long, close_short + Action string `json:"action"` // open_long, open_short, close_long, close_short, update_stop_loss, update_take_profit, partial_close Symbol string `json:"symbol"` // 币种 - Quantity float64 `json:"quantity"` // 数量 + Quantity float64 `json:"quantity"` // 数量（部分平仓时使用） Leverage int `json:"leverage"` // 杠杆（开仓时） Price float64 `json:"price"` // 执行价格 OrderID int64 `json:"order_id"` // 订单ID @@ -243,8 +243,9 @@ func (l *DecisionLogger) GetStatistics() (*Statistics, error) { switch action.Action { case "open_long", "open_short": stats.TotalOpenPositions++ - case "close_long", "close_short": + case "close_long", "close_short", "partial_close", "auto_close_long", "auto_close_short": stats.TotalClosePositions++ + // update_stop_loss 和 update_take_profit 不計入統計 } } } @@ -348,11 +349,22 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna symbol := action.Symbol side := "" - if action.Action == "open_long" || action.Action == "close_long" { + if action.Action == "open_long" || action.Action == "close_long" || action.Action == "partial_close" || action.Action == "auto_close_long" { side = "long" - } else if action.Action == "open_short" || action.Action == "close_short" { + } else if action.Action == "open_short" || action.Action == "close_short" || action.Action == "auto_close_short" { side = "short" } + + // partial_close 需要根據持倉判斷方向 + if action.Action == "partial_close" && side == "" { + for key, pos := range openPositions { + if posSymbol, _ := pos["side"].(string); key == symbol+"_"+posSymbol { + side = posSymbol + break + } + } + } + posKey := symbol + "_" + side switch action.Action { @@ -365,9 +377,10 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna "quantity": action.Quantity, "leverage": action.Leverage, } - case "close_long", "close_short": + case "close_long", "close_short", "auto_close_long", "auto_close_short": // 移除已平仓记录 delete(openPositions, posKey) + // partial_close 不處理，保留持倉記錄 } } } @@ -382,11 +395,23 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna symbol := action.Symbol side := "" - if action.Action == "open_long" || action.Action == "close_long" { + if action.Action == "open_long" || action.Action == "close_long" || action.Action == "partial_close" || action.Action == "auto_close_long" { side = "long" - } else if action.Action == "open_short" || action.Action == "close_short" { + } else if action.Action == "open_short" || action.Action == "close_short" || action.Action == "auto_close_short" { side = "short" } + + // partial_close 需要根據持倉判斷方向 + if action.Action == "partial_close" { + // 從 openPositions 中查找持倉方向 + for key, pos := range openPositions { + if posSymbol, _ := pos["side"].(string); key == symbol+"_"+posSymbol { + side = posSymbol + break + } + } + } + posKey := symbol + "_" + side // 使用symbol_side作为key，区分多空持仓 switch action.Action { @@ -400,7 +425,7 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna "leverage": action.Leverage, } - case "close_long", "close_short": + case "close_long", "close_short", "partial_close", "auto_close_long", "auto_close_short": // 查找对应的开仓记录（可能来自预填充或当前窗口） if openPos, exists := openPositions[posKey]; exists { openPrice := openPos["openPrice"].(float64) @@ -409,18 +434,24 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna quantity := openPos["quantity"].(float64) leverage := openPos["leverage"].(int) + // 对于 partial_close，使用实际平仓数量；否则使用完整仓位数量 + actualQuantity := quantity + if action.Action == "partial_close" { + actualQuantity = action.Quantity + } + // 计算实际盈亏（USDT） - // 合约交易 PnL 计算：quantity × 价格差 + // 合约交易 PnL 计算：actualQuantity × 价格差 // 注意：杠杆不影响绝对盈亏，只影响保证金需求 var pnl float64 if side == "long" { - pnl = quantity * (action.Price - openPrice) + pnl = actualQuantity * (action.Price - openPrice) } else { - pnl = quantity * (openPrice - action.Price) + pnl = actualQuantity * (openPrice - action.Price) } // 计算盈亏百分比（相对保证金） - positionValue := quantity * openPrice + positionValue := actualQuantity * openPrice marginUsed := positionValue / float64(leverage) pnlPct := 0.0 if marginUsed > 0 { @@ -431,7 +462,7 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna outcome := TradeOutcome{ Symbol: symbol, Side: side, - Quantity: quantity, + Quantity: actualQuantity, Leverage: leverage, OpenPrice: openPrice, ClosePrice: action.Price, @@ -472,8 +503,10 @@ func (l *DecisionLogger) AnalyzePerformance(lookbackCycles int) (*PerformanceAna stats.LosingTrades++ } - // 移除已平仓记录 - delete(openPositions, posKey) + // 移除已平仓记录（partial_close 不刪除，因為還有剩餘倉位） + if action.Action != "partial_close" { + delete(openPositions, posKey) + } } } } diff --git a/main.go b/main.go index 36537b507..4864f2ad4 100644 --- a/main.go +++ b/main.go @@ -25,19 +25,20 @@ type LeverageConfig struct { // ConfigFile 配置文件结构，只包含需要同步到数据库的字段 type ConfigFile struct { - AdminMode bool `json:"admin_mode"` - APIServerPort int `json:"api_server_port"` - UseDefaultCoins bool `json:"use_default_coins"` - DefaultCoins []string `json:"default_coins"` - CoinPoolAPIURL string `json:"coin_pool_api_url"` - OITopAPIURL string `json:"oi_top_api_url"` - InsideCoins bool `json:"inside_coins"` - MaxDailyLoss float64 `json:"max_daily_loss"` - MaxDrawdown float64 `json:"max_drawdown"` - StopTradingMinutes int `json:"stop_trading_minutes"` - Leverage LeverageConfig `json:"leverage"` - JWTSecret string `json:"jwt_secret"` - DataKLineTime string `json:"data_k_line_time"` + AdminMode bool `json:"admin_mode"` + APIServerPort int `json:"api_server_port"` + UseDefaultCoins bool `json:"use_default_coins"` + DefaultCoins []string `json:"default_coins"` + CoinPoolAPIURL string `json:"coin_pool_api_url"` + OITopAPIURL string `json:"oi_top_api_url"` + InsideCoins bool `json:"inside_coins"` + MaxDailyLoss float64 `json:"max_daily_loss"` + MaxDrawdown float64 `json:"max_drawdown"` + StopTradingMinutes int `json:"stop_trading_minutes"` + Leverage LeverageConfig `json:"leverage"` + JWTSecret string `json:"jwt_secret"` + DataKLineTime string `json:"data_k_line_time"` + News []config.NewsConfig `json:"news"` } // syncConfigToDatabase 从config.json读取配置并同步到数据库 @@ -96,6 +97,14 @@ func syncConfigToDatabase(database *config.Database) error { configs["jwt_secret"] = configFile.JWTSecret } + // 新闻配置 + if len(configFile.News) != 0 { + newsJSON, err := json.Marshal(configFile.News) + if err == nil { + configs["news_config"] = string(newsJSON) + } + } + // 更新数据库配置 for key, value := range configs { if err := database.SetSystemConfig(key, value); err != nil { diff --git a/manager/trader_manager.go b/manager/trader_manager.go index d3861cdb1..1da304366 100644 --- a/manager/trader_manager.go +++ b/manager/trader_manager.go @@ -5,6 +5,7 @@ import ( "fmt" "log" "nofx/config" + "nofx/news" "nofx/trader" "strconv" "strings" @@ -83,8 +84,31 @@ func (tm *TraderManager) LoadTradersFromDatabase(database *config.Database) erro } } + // 获取新闻源配置 + var newsCfg []config.NewsConfig + newsConfStr, _ := database.GetSystemConfig("news_config") + if newsConfStr != "" { + if err := json.Unmarshal([]byte(newsConfStr), &newsCfg); err != nil { + log.Printf("⚠️ 解析新闻源配置失败: %v，使用空列表", err) + newsCfg = []config.NewsConfig{} + } + + // 新闻配置处理 + for index, newsConf := range newsCfg { + switch newsConf.Provider { + case news.ProviderTelegram: + if newsConf.Telegram.BaseURL == "" { + newsCfg[index].Telegram.BaseURL = "https://t.me/s" + } + if len(newsConf.TelegramChannel) == 0 { + newsCfg[index].TelegramChannel = append(newsCfg[index].TelegramChannel, config.NewsConfigTelegramChannel{ID: "ChannelPANews", Name: "PANews"}) + } + } + } + } + // 为每个交易员获取AI模型和交易所配置 - for _, traderCfg := range allTraders { + for _, traderCfg := range allTraders { // 获取AI模型配置（使用交易员所属的用户ID） aiModels, err := database.GetAIModels(traderCfg.UserID) if err != nil { @@ -157,7 +181,7 @@ func (tm *TraderManager) LoadTradersFromDatabase(database *config.Database) erro } // 添加到TraderManager - err = tm.addTraderFromDB(traderCfg, aiModelCfg, exchangeCfg, coinPoolURL, oiTopURL, maxDailyLoss, maxDrawdown, stopTradingMinutes, defaultCoins) + err = tm.addTraderFromDB(traderCfg, aiModelCfg, exchangeCfg, newsCfg, coinPoolURL, oiTopURL, maxDailyLoss, maxDrawdown, stopTradingMinutes, defaultCoins) if err != nil { log.Printf("❌ 添加交易员 %s 失败: %v", traderCfg.Name, err) continue @@ -169,7 +193,7 @@ func (tm *TraderManager) LoadTradersFromDatabase(database *config.Database) erro } // addTraderFromConfig 内部方法：从配置添加交易员（不加锁，因为调用方已加锁） -func (tm *TraderManager) addTraderFromDB(traderCfg *config.TraderRecord, aiModelCfg *config.AIModelConfig, exchangeCfg *config.ExchangeConfig, coinPoolURL, oiTopURL string, maxDailyLoss, maxDrawdown float64, stopTradingMinutes int, defaultCoins []string) error { +func (tm *TraderManager) addTraderFromDB(traderCfg *config.TraderRecord, aiModelCfg *config.AIModelConfig, exchangeCfg *config.ExchangeConfig, newsCfg []config.NewsConfig, coinPoolURL, oiTopURL string, maxDailyLoss, maxDrawdown float64, stopTradingMinutes int, defaultCoins []string) error { if _, exists := tm.traders[traderCfg.ID]; exists { return fmt.Errorf("trader ID '%s' 已存在", traderCfg.ID) } @@ -186,7 +210,7 @@ func (tm *TraderManager) addTraderFromDB(traderCfg *config.TraderRecord, aiModel } } } - + // 如果没有指定交易币种，使用默认币种 if len(tradingCoins) == 0 { tradingCoins = defaultCoins @@ -200,7 +224,7 @@ func (tm *TraderManager) addTraderFromDB(traderCfg *config.TraderRecord, aiModel } // 构建AutoTraderConfig - traderConfig := trader.AutoTraderConfig{ + traderConfig := trader.AutoTraderConfig{ ID: traderCfg.ID, Name: traderCfg.Name, AIModel: aiModelCfg.Provider, // 使用provider作为模型标识 @@ -226,6 +250,7 @@ func (tm *TraderManager) addTraderFromDB(traderCfg *config.TraderRecord, aiModel DefaultCoins: defaultCoins, TradingCoins: tradingCoins, SystemPromptTemplate: traderCfg.SystemPromptTemplate, // 系统提示词模板 + NewsConfig: newsCfg, // 新闻源配置 } // 根据交易所类型设置API密钥 @@ -253,7 +278,7 @@ func (tm *TraderManager) addTraderFromDB(traderCfg *config.TraderRecord, aiModel if err != nil { return fmt.Errorf("创建trader失败: %w", err) } - + // 设置自定义prompt（如果有） if traderCfg.CustomPrompt != "" { at.SetCustomPrompt(traderCfg.CustomPrompt) @@ -293,7 +318,7 @@ func (tm *TraderManager) AddTraderFromDB(traderCfg *config.TraderRecord, aiModel } } } - + // 如果没有指定交易币种，使用默认币种 if len(tradingCoins) == 0 { tradingCoins = defaultCoins @@ -359,7 +384,7 @@ func (tm *TraderManager) AddTraderFromDB(traderCfg *config.TraderRecord, aiModel if err != nil { return fmt.Errorf("创建trader失败: %w", err) } - + // 设置自定义prompt（如果有） if traderCfg.CustomPrompt != "" { at.SetCustomPrompt(traderCfg.CustomPrompt) @@ -488,9 +513,9 @@ func (tm *TraderManager) GetCompetitionData() (map[string]interface{}, error) { 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) @@ -522,7 +547,7 @@ func (tm *TraderManager) GetCompetitionData() (map[string]interface{}, error) { "is_running": status["is_running"], } } - + traders = append(traders, traderData) } comparison["traders"] = traders @@ -708,7 +733,7 @@ func (tm *TraderManager) loadSingleTrader(traderCfg *config.TraderRecord, aiMode } } } - + // 如果没有指定交易币种，使用默认币种 if len(tradingCoins) == 0 { tradingCoins = defaultCoins @@ -723,25 +748,25 @@ func (tm *TraderManager) loadSingleTrader(traderCfg *config.TraderRecord, aiMode // 构建AutoTraderConfig traderConfig := trader.AutoTraderConfig{ - ID: traderCfg.ID, - Name: traderCfg.Name, - AIModel: aiModelCfg.Provider, // 使用provider作为模型标识 - Exchange: exchangeCfg.ID, // 使用exchange ID - InitialBalance: traderCfg.InitialBalance, - BTCETHLeverage: traderCfg.BTCETHLeverage, - AltcoinLeverage: traderCfg.AltcoinLeverage, - ScanInterval: time.Duration(traderCfg.ScanIntervalMinutes) * time.Minute, - CoinPoolAPIURL: effectiveCoinPoolURL, - CustomAPIURL: aiModelCfg.CustomAPIURL, // 自定义API URL - CustomModelName: aiModelCfg.CustomModelName, // 自定义模型名称 - UseQwen: aiModelCfg.Provider == "qwen", - MaxDailyLoss: maxDailyLoss, - MaxDrawdown: maxDrawdown, - StopTradingTime: time.Duration(stopTradingMinutes) * time.Minute, - IsCrossMargin: traderCfg.IsCrossMargin, - DefaultCoins: defaultCoins, - TradingCoins: tradingCoins, - SystemPromptTemplate: traderCfg.SystemPromptTemplate, // 系统提示词模板 + ID: traderCfg.ID, + Name: traderCfg.Name, + AIModel: aiModelCfg.Provider, // 使用provider作为模型标识 + Exchange: exchangeCfg.ID, // 使用exchange ID + InitialBalance: traderCfg.InitialBalance, + BTCETHLeverage: traderCfg.BTCETHLeverage, + AltcoinLeverage: traderCfg.AltcoinLeverage, + ScanInterval: time.Duration(traderCfg.ScanIntervalMinutes) * time.Minute, + CoinPoolAPIURL: effectiveCoinPoolURL, + CustomAPIURL: aiModelCfg.CustomAPIURL, // 自定义API URL + CustomModelName: aiModelCfg.CustomModelName, // 自定义模型名称 + UseQwen: aiModelCfg.Provider == "qwen", + MaxDailyLoss: maxDailyLoss, + MaxDrawdown: maxDrawdown, + StopTradingTime: time.Duration(stopTradingMinutes) * time.Minute, + IsCrossMargin: traderCfg.IsCrossMargin, + DefaultCoins: defaultCoins, + TradingCoins: tradingCoins, + SystemPromptTemplate: traderCfg.SystemPromptTemplate, // 系统提示词模板 } // 根据交易所类型设置API密钥 @@ -769,7 +794,7 @@ func (tm *TraderManager) loadSingleTrader(traderCfg *config.TraderRecord, aiMode if err != nil { return fmt.Errorf("创建trader失败: %w", err) } - + // 设置自定义prompt（如果有） if traderCfg.CustomPrompt != "" { at.SetCustomPrompt(traderCfg.CustomPrompt) diff --git a/market/data.go b/market/data.go index cd40be759..5b0f98d28 100644 --- a/market/data.go +++ b/market/data.go @@ -12,18 +12,31 @@ import ( // Get 获取指定代币的市场数据 func Get(symbol string) (*Data, error) { - var klines3m, klines4h []Kline + var klines3m, klines15m, klines1h, klines4h []Kline var err error // 标准化symbol symbol = Normalize(symbol) + // 获取3分钟K线数据 (最近10个) - klines3m, err = WSMonitorCli.GetCurrentKlines(symbol, "3m") // 多获取一些用于计算 + klines3m, err = WSMonitorCli.GetCurrentKlines(symbol, "3m") if err != nil { return nil, fmt.Errorf("获取3分钟K线失败: %v", err) } - // 获取4小时K线数据 (最近10个) - klines4h, err = WSMonitorCli.GetCurrentKlines(symbol, "4h") // 多获取用于计算指标 + // 获取15分钟K线数据 (最近40个) - 短期趋势 + klines15m, err = WSMonitorCli.GetCurrentKlines(symbol, "15m") + if err != nil { + return nil, fmt.Errorf("获取15分钟K线失败: %v", err) + } + + // 获取1小时K线数据 (最近60个) - 中期趋势 + klines1h, err = WSMonitorCli.GetCurrentKlines(symbol, "1h") + if err != nil { + return nil, fmt.Errorf("获取1小时K线失败: %v", err) + } + + // 获取4小时K线数据 (最近60个) - 长期趋势 + klines4h, err = WSMonitorCli.GetCurrentKlines(symbol, "4h") if err != nil { return nil, fmt.Errorf("获取4小时K线失败: %v", err) } @@ -63,10 +76,16 @@ func Get(symbol string) (*Data, error) { // 获取Funding Rate fundingRate, _ := getFundingRate(symbol) - // 计算日内系列数据 + // 计算日内系列数据 (3分钟) intradayData := calculateIntradaySeries(klines3m) - // 计算长期数据 + // 计算15分钟系列数据 + midTermData15m := calculateMidTermSeries15m(klines15m) + + // 计算1小时系列数据 + midTermData1h := calculateMidTermSeries1h(klines1h) + + // 计算长期数据 (4小时) longerTermData := calculateLongerTermData(klines4h) return &Data{ @@ -80,6 +99,8 @@ func Get(symbol string) (*Data, error) { OpenInterest: oiData, FundingRate: fundingRate, IntradaySeries: intradayData, + MidTermSeries15m: midTermData15m, + MidTermSeries1h: midTermData1h, LongerTermContext: longerTermData, }, nil } @@ -243,6 +264,96 @@ func calculateIntradaySeries(klines []Kline) *IntradayData { return data } +// calculateMidTermSeries15m 计算15分钟系列数据 +func calculateMidTermSeries15m(klines []Kline) *MidTermData15m { + data := &MidTermData15m{ + MidPrices: make([]float64, 0, 10), + EMA20Values: make([]float64, 0, 10), + MACDValues: make([]float64, 0, 10), + RSI7Values: make([]float64, 0, 10), + RSI14Values: make([]float64, 0, 10), + } + + // 获取最近10个数据点 + start := len(klines) - 10 + if start < 0 { + start = 0 + } + + for i := start; i < len(klines); i++ { + data.MidPrices = append(data.MidPrices, klines[i].Close) + + // 计算每个点的EMA20 + if i >= 19 { + ema20 := calculateEMA(klines[:i+1], 20) + data.EMA20Values = append(data.EMA20Values, ema20) + } + + // 计算每个点的MACD + if i >= 25 { + macd := calculateMACD(klines[:i+1]) + data.MACDValues = append(data.MACDValues, macd) + } + + // 计算每个点的RSI + if i >= 7 { + rsi7 := calculateRSI(klines[:i+1], 7) + data.RSI7Values = append(data.RSI7Values, rsi7) + } + if i >= 14 { + rsi14 := calculateRSI(klines[:i+1], 14) + data.RSI14Values = append(data.RSI14Values, rsi14) + } + } + + return data +} + +// calculateMidTermSeries1h 计算1小时系列数据 +func calculateMidTermSeries1h(klines []Kline) *MidTermData1h { + data := &MidTermData1h{ + MidPrices: make([]float64, 0, 10), + EMA20Values: make([]float64, 0, 10), + MACDValues: make([]float64, 0, 10), + RSI7Values: make([]float64, 0, 10), + RSI14Values: make([]float64, 0, 10), + } + + // 获取最近10个数据点 + start := len(klines) - 10 + if start < 0 { + start = 0 + } + + for i := start; i < len(klines); i++ { + data.MidPrices = append(data.MidPrices, klines[i].Close) + + // 计算每个点的EMA20 + if i >= 19 { + ema20 := calculateEMA(klines[:i+1], 20) + data.EMA20Values = append(data.EMA20Values, ema20) + } + + // 计算每个点的MACD + if i >= 25 { + macd := calculateMACD(klines[:i+1]) + data.MACDValues = append(data.MACDValues, macd) + } + + // 计算每个点的RSI + if i >= 7 { + rsi7 := calculateRSI(klines[:i+1], 7) + data.RSI7Values = append(data.RSI7Values, rsi7) + } + if i >= 14 { + rsi14 := calculateRSI(klines[:i+1], 14) + data.RSI14Values = append(data.RSI14Values, rsi14) + } + } + + return data +} + // calculateLongerTermData 计算长期数据 func calculateLongerTermData(klines []Kline) *LongerTermData { data := &LongerTermData{ @@ -396,6 +507,54 @@ func Format(data *Data) string { } } + if data.MidTermSeries15m != nil { + sb.WriteString("Mid‑term series (15‑minute intervals, oldest → latest):\n\n") + + if len(data.MidTermSeries15m.MidPrices) > 0 { + sb.WriteString(fmt.Sprintf("Mid prices: %s\n\n", formatFloatSlice(data.MidTermSeries15m.MidPrices))) + } + + if len(data.MidTermSeries15m.EMA20Values) > 0 { + sb.WriteString(fmt.Sprintf("EMA indicators (20‑period): %s\n\n", formatFloatSlice(data.MidTermSeries15m.EMA20Values))) + } + + if len(data.MidTermSeries15m.MACDValues) > 0 { + sb.WriteString(fmt.Sprintf("MACD indicators: %s\n\n", formatFloatSlice(data.MidTermSeries15m.MACDValues))) + } + + if len(data.MidTermSeries15m.RSI7Values) > 0 { + sb.WriteString(fmt.Sprintf("RSI indicators (7‑Period): %s\n\n", formatFloatSlice(data.MidTermSeries15m.RSI7Values))) + } + + if len(data.MidTermSeries15m.RSI14Values) > 0 { + sb.WriteString(fmt.Sprintf("RSI indicators (14‑Period): %s\n\n", formatFloatSlice(data.MidTermSeries15m.RSI14Values))) + } + } + + if data.MidTermSeries1h != nil { + sb.WriteString("Mid‑term series (1‑hour intervals, oldest → latest):\n\n") + + if len(data.MidTermSeries1h.MidPrices) > 0 { + sb.WriteString(fmt.Sprintf("Mid prices: %s\n\n", formatFloatSlice(data.MidTermSeries1h.MidPrices))) + } + + if len(data.MidTermSeries1h.EMA20Values) > 0 { + sb.WriteString(fmt.Sprintf("EMA indicators (20‑period): %s\n\n", formatFloatSlice(data.MidTermSeries1h.EMA20Values))) + } + + if len(data.MidTermSeries1h.MACDValues) > 0 { + sb.WriteString(fmt.Sprintf("MACD indicators: %s\n\n", formatFloatSlice(data.MidTermSeries1h.MACDValues))) + } + + if len(data.MidTermSeries1h.RSI7Values) > 0 { + sb.WriteString(fmt.Sprintf("RSI indicators (7‑Period): %s\n\n", formatFloatSlice(data.MidTermSeries1h.RSI7Values))) + } + + if len(data.MidTermSeries1h.RSI14Values) > 0 { + sb.WriteString(fmt.Sprintf("RSI indicators (14‑Period): %s\n\n", formatFloatSlice(data.MidTermSeries1h.RSI14Values))) + } + } + if data.LongerTermContext != nil { sb.WriteString("Longer‑term context (4‑hour timeframe):\n\n") diff --git a/market/monitor.go b/market/monitor.go index 23e126d98..c5fc6c664 100644 --- a/market/monitor.go +++ b/market/monitor.go @@ -9,19 +9,29 @@ import ( "time" ) +const ( + // MaxStreamsPerConnection Binance WebSocket 單連接最大訂閱流數限制 + MaxStreamsPerConnection = 1024 + // SafeMaxSymbols 安全的最大幣種數量（留 2.3% 緩衝空間） + // 250 個幣種 × 4 時間週期 = 1000 流 < 1024 + SafeMaxSymbols = 250 +) + type WSMonitor struct { - wsClient *WSClient - combinedClient *CombinedStreamsClient - symbols []string - featuresMap sync.Map - alertsChan chan Alert - klineDataMap3m sync.Map // 存储每个交易对的K线历史数据 - klineDataMap4h sync.Map // 存储每个交易对的K线历史数据 - tickerDataMap sync.Map // 存储每个交易对的ticker数据 - batchSize int - filterSymbols sync.Map // 使用sync.Map来存储需要监控的币种和其状态 - symbolStats sync.Map // 存储币种统计信息 - FilterSymbol []string //经过筛选的币种 + wsClient *WSClient + combinedClient *CombinedStreamsClient + symbols []string + featuresMap sync.Map + alertsChan chan Alert + klineDataMap3m sync.Map // 存储每个交易对的K线历史数据 + klineDataMap15m sync.Map // 存储每个交易对的15分钟K线历史数据 + klineDataMap1h sync.Map // 存储每个交易对的1小时K线历史数据 + klineDataMap4h sync.Map // 存储每个交易对的K线历史数据 + tickerDataMap sync.Map // 存储每个交易对的ticker数据 + batchSize int + filterSymbols sync.Map // 使用sync.Map来存储需要监控的币种和其状态 + symbolStats sync.Map // 存储币种统计信息 + FilterSymbol []string //经过筛选的币种 } type SymbolStats struct { LastActiveTime time.Time @@ -32,7 +42,7 @@ type SymbolStats struct { } var WSMonitorCli *WSMonitor -var subKlineTime = []string{"3m", "4h"} // 管理订阅流的K线周期 +var subKlineTime = []string{"3m", "15m", "1h", "4h"} // 管理订阅流的K线周期 func NewWSMonitor(batchSize int) *WSMonitor { WSMonitorCli = &WSMonitor{ @@ -67,6 +77,34 @@ func (m *WSMonitor) Initialize(coins []string) error { } log.Printf("找到 %d 个交易对", len(m.symbols)) + + // WebSocket 訂閱流數檢查與自動調整 + totalStreams := len(m.symbols) * len(subKlineTime) + + if len(m.symbols) > SafeMaxSymbols { + log.Printf("⚠️ 幣種數量過多，自動調整:") + log.Printf(" - 原始數量: %d 個幣種 (%d 流)", len(m.symbols), totalStreams) + log.Printf(" - Binance 限制: %d 流/連接", MaxStreamsPerConnection) + log.Printf(" - 時間週期: %d (%v)", len(subKlineTime), subKlineTime) + + // 調整到安全上限 + m.symbols = m.symbols[:SafeMaxSymbols] + totalStreams = len(m.symbols) * len(subKlineTime) + + log.Printf(" - 調整後: %d 個幣種 (%d 流)", len(m.symbols), totalStreams) + log.Printf(" - 已過濾: 前 %d 個幣種保留，其餘忽略", SafeMaxSymbols) + } + + // 顯示訂閱使用率 + usagePercent := float64(totalStreams) / float64(MaxStreamsPerConnection) * 100 + log.Printf("✓ WebSocket 訂閱: %d 個幣種 × %d 時間週期 = %d 流 (%.1f%% 用量)", + len(m.symbols), len(subKlineTime), totalStreams, usagePercent) + + // 接近上限警告（>90%） + if usagePercent > 90 { + log.Printf("⚠️ 警告: 訂閱流使用率較高 (%.1f%%)，建議減少幣種數量以確保穩定性", usagePercent) + } + // 初始化历史数据 if err := m.initializeHistoricalData(); err != nil { log.Printf("初始化历史数据失败: %v", err) @@ -89,23 +127,38 @@ func (m *WSMonitor) initializeHistoricalData() error { defer wg.Done() defer func() { <-semaphore }() - // 获取历史K线数据 - klines, err := apiClient.GetKlines(s, "3m", 100) + // 获取3分钟历史K线数据 + klines3m, err := apiClient.GetKlines(s, "3m", 100) if err != nil { - log.Printf("获取 %s 历史数据失败: %v", s, err) - return + log.Printf("获取 %s 3m历史数据失败: %v", s, err) + } else if len(klines3m) > 0 { + m.klineDataMap3m.Store(s, klines3m) + log.Printf("已加载 %s 的历史K线数据-3m: %d 条", s, len(klines3m)) } - if len(klines) > 0 { - m.klineDataMap3m.Store(s, klines) - log.Printf("已加载 %s 的历史K线数据-3m: %d 条", s, len(klines)) + + // 获取15分钟历史K线数据 + klines15m, err := apiClient.GetKlines(s, "15m", 100) + if err != nil { + log.Printf("获取 %s 15m历史数据失败: %v", s, err) + } else if len(klines15m) > 0 { + m.klineDataMap15m.Store(s, klines15m) + log.Printf("已加载 %s 的历史K线数据-15m: %d 条", s, len(klines15m)) } - // 获取历史K线数据 - klines4h, err := apiClient.GetKlines(s, "4h", 100) + + // 获取1小时历史K线数据 + klines1h, err := apiClient.GetKlines(s, "1h", 100) if err != nil { - log.Printf("获取 %s 历史数据失败: %v", s, err) - return + log.Printf("获取 %s 1h历史数据失败: %v", s, err) + } else if len(klines1h) > 0 { + m.klineDataMap1h.Store(s, klines1h) + log.Printf("已加载 %s 的历史K线数据-1h: %d 条", s, len(klines1h)) } - if len(klines4h) > 0 { + + // 获取4小时历史K线数据 + klines4h, err := apiClient.GetKlines(s, "4h", 100) + if err != nil { + log.Printf("获取 %s 4h历史数据失败: %v", s, err) + } else if len(klines4h) > 0 { m.klineDataMap4h.Store(s, klines4h) log.Printf("已加载 %s 的历史K线数据-4h: %d 条", s, len(klines4h)) } @@ -180,11 +233,16 @@ func (m *WSMonitor) handleKlineData(symbol string, ch <-chan []byte, _time strin func (m *WSMonitor) getKlineDataMap(_time string) *sync.Map { var klineDataMap *sync.Map - if _time == "3m" { + switch _time { + case "3m": klineDataMap = &m.klineDataMap3m - } else if _time == "4h" { + case "15m": + klineDataMap = &m.klineDataMap15m + case "1h": + klineDataMap = &m.klineDataMap1h + case "4h": klineDataMap = &m.klineDataMap4h - } else { + default: klineDataMap = &sync.Map{} } return klineDataMap diff --git a/market/types.go b/market/types.go index 82f444157..48353c45c 100644 --- a/market/types.go +++ b/market/types.go @@ -13,8 +13,10 @@ type Data struct { CurrentRSI7 float64 OpenInterest *OIData FundingRate float64 - IntradaySeries *IntradayData - LongerTermContext *LongerTermData + IntradaySeries *IntradayData // 3分钟数据 - 实时价格 + MidTermSeries15m *MidTermData15m // 15分钟数据 - 短期趋势 + MidTermSeries1h *MidTermData1h // 1小时数据 - 中期趋势 + LongerTermContext *LongerTermData // 4小时数据 - 长期趋势 } // OIData Open Interest数据 @@ -23,7 +25,7 @@ type OIData struct { Average float64 } -// IntradayData 日内数据(3分钟间隔) +// IntradayData 日内数据(3分钟间隔) - 主要用于获取实时价格 type IntradayData struct { MidPrices []float64 EMA20Values []float64 @@ -32,6 +34,24 @@ type IntradayData struct { RSI14Values []float64 } +// MidTermData15m 15分钟时间框架数据 - 短期趋势过滤 +type MidTermData15m struct { + MidPrices []float64 + EMA20Values []float64 + MACDValues []float64 + RSI7Values []float64 + RSI14Values []float64 +} + +// MidTermData1h 1小时时间框架数据 - 中期趋势确认 +type MidTermData1h struct { + MidPrices []float64 + EMA20Values []float64 + MACDValues []float64 + RSI7Values []float64 + RSI14Values []float64 +} + // LongerTermData 长期数据(4小时时间框架) type LongerTermData struct { EMA20 float64 diff --git a/mcp/client.go b/mcp/client.go index 9191dfafd..aa1d5435f 100644 --- a/mcp/client.go +++ b/mcp/client.go @@ -280,6 +280,8 @@ func isRetryableError(err error) bool { "connection refused", "temporary failure", "no such host", + "stream error", // HTTP/2 stream 错误 + "INTERNAL_ERROR", // 服务端内部错误 } for _, retryable := range retryableErrors { if strings.Contains(errStr, retryable) { diff --git a/news/news.go b/news/news.go new file mode 100644 index 000000000..b40f99cbb --- /dev/null +++ b/news/news.go @@ -0,0 +1,73 @@ +package news + +import ( + "fmt" + "time" +) + +const ( + // ProviderTelegrame 电报 + ProviderTelegram = "telegram" +) + +// NewsItem 表示一条新闻条目的核心数据结构。 +// 该结构体通常用于金融资讯、舆情分析等场景，存储新闻的元数据、内容及情感分析结果。 +type NewsItem struct { + // Symbol 代表与该新闻相关的金融产品代码（如股票代码 "AAPL"）。 + // 该字段是新闻关联资产的关键标识符。 + Symbol string `json:"symbol"` + + // Headline 是新闻的标题。 + // 此字段为必填项，应简洁概括新闻主要内容。 + Headline string `json:"headline"` + + // Source 指明新闻的发布来源（例如："路透社"、"彭博社"）。 + // 该字段为可选字段，若为空则不会在 JSON 输出中体现。 + Source string `json:"source,omitempty"` + + // URL 是新闻原文的完整链接。 + // 该字段为可选字段，若为空则不会在 JSON 输出中体现。 + URL string `json:"url,omitempty"` + + // PublishedAt 记录新闻准确的发布时间。 + // 使用 time.Time 类型以确保时间数据的一致性和可序列化。 + PublishedAt time.Time `json:"published_at"` + + // Sentiment 表示对新闻内容进行情感分析得出的分值。 + // 取值范围为 -100 到 100，其中 -100 代表极度负面，100 代表极度正面，0 为中性。 + // 该字段为可选字段，若未进行分析则不会在 JSON 输出中体现。 + Sentiment int `json:"sentiment,omitempty"` + + // Impact 评估该新闻可能对市场产生的影响程度。 + // 取值范围为 0 到 100，数值越大表示潜在影响越大。 + // 该字段为可选字段，若未进行评估则不会在 JSON 输出中体现。 + Impact int `json:"impact,omitempty"` + + // Summary 是新闻内容的简要摘要或关键要点。 + // 该字段为可选字段，若为空则不会在 JSON 输出中体现。 + Summary string `json:"summary,omitempty"` + + // Tags 是与新闻内容相关的关键词标签列表（例如：["科技", "财报", "Apple"]）。 + // 该字段为可选字段，若为空切片则不会在 JSON 输出中体现。 + Tags []string `json:"tags,omitempty"` +} + +func (ni NewsItem) String() string { + return fmt.Sprintf("代币符号: %s\n标题: %s\n来源: %s\n发布时间: %s\n情感分数: %d\n影响指数: %d\n摘要: %s\n标签: %v\n%s\n", + ni.Symbol, + ni.Headline, + ni.Source, + ni.PublishedAt.Format("2006-01-02 15:04:05"), + ni.Sentiment, + ni.Impact, + ni.Summary, + ni.Tags, + "-----------", + ) +} + +// Provider 新闻提供者接口（由调用方实现） +type Provider interface { + // FetchNews 按币种批量获取最新新闻；返回值按symbol分组 + FetchNews(symbols []string, limit int) (map[string][]NewsItem, error) +} diff --git a/news/provider/default/default.go b/news/provider/default/default.go new file mode 100644 index 000000000..bfe1ed25e --- /dev/null +++ b/news/provider/default/default.go @@ -0,0 +1,145 @@ +package news + +import ( + "fmt" + "nofx/news" + "time" +) + +// DefaultNewsProvider 默认新闻提供者实现（参考示例） +// 展示如何实现 NewsProvider 接口 +type DefaultNewsProvider struct { + // API配置（根据实际数据源调整） + APIKey string + BaseURL string + Timeout time.Duration + CacheTime time.Duration + + // 可选：缓存机制 + cache map[string]cacheEntry +} + +type cacheEntry struct { + news []news.NewsItem + timestamp time.Time +} + +// NewDefaultNewsProvider 创建默认新闻提供者 +func NewDefaultNewsProvider(apiKey, baseURL string) *DefaultNewsProvider { + return &DefaultNewsProvider{ + APIKey: apiKey, + BaseURL: baseURL, + Timeout: 30 * time.Second, + CacheTime: 5 * time.Minute, // 5分钟缓存 + cache: make(map[string]cacheEntry), + } +} + +// FetchNews 实现 NewsProvider 接口 +// 按币种批量获取最新新闻，返回值按symbol分组 +func (p *DefaultNewsProvider) FetchNews(symbols []string, limit int) (map[string][]news.NewsItem, error) { + if len(symbols) == 0 { + return make(map[string][]news.NewsItem), nil + } + + result := make(map[string][]news.NewsItem) + + for _, symbol := range symbols { + // 1. 检查缓存 + if cached, ok := p.getFromCache(symbol); ok { + result[symbol] = cached + continue + } + + // 2. 从数据源获取（具体实现留空，由你后续补充） + news, err := p.fetchFromSource(symbol, limit) + if err != nil { + // 单个币种失败不影响其他币种 + continue + } + + // 3. 更新缓存 + p.updateCache(symbol, news) + result[symbol] = news + } + + return result, nil +} + +// getFromCache 从缓存获取新闻 +func (p *DefaultNewsProvider) getFromCache(symbol string) ([]news.NewsItem, bool) { + entry, exists := p.cache[symbol] + if !exists { + return nil, false + } + + // 检查缓存是否过期 + if time.Since(entry.timestamp) > p.CacheTime { + delete(p.cache, symbol) + return nil, false + } + + return entry.news, true +} + +// updateCache 更新缓存 +func (p *DefaultNewsProvider) updateCache(symbol string, news []news.NewsItem) { + p.cache[symbol] = cacheEntry{ + news: news, + timestamp: time.Now(), + } +} + +// fetchFromSource 从数据源获取新闻（具体实现由你补充） +func (p *DefaultNewsProvider) fetchFromSource(symbol string, limit int) ([]news.NewsItem, error) { + // TODO: 实现具体的新闻获取逻辑 + // 可选的数据源： + // 1. CryptoPanic API: https://cryptopanic.com/developers/api/ + // 2. CoinGecko Events API + // 3. 交易所公告（币安、OKX等） + // 4. Twitter/X API + // 5. Reddit API + // 6. 自定义爬虫 + + // 示例返回结构（实际需要调用API） + news := []news.NewsItem{ + { + Symbol: symbol, + Headline: fmt.Sprintf("%s 相关新闻标题", symbol), + Source: "CryptoPanic", // 或其他来源 + URL: "https://example.com/news/123", + PublishedAt: time.Now().Add(-1 * time.Hour), + Sentiment: 0, // -100 到 100 + Impact: 50, // 0 到 100 + Summary: "新闻摘要内容...", + Tags: []string{"breaking", "market"}, + }, + } + + return news, nil +} + +// 可选：实现其他辅助方法 + +// FilterByImpact 按影响力过滤新闻 +func (p *DefaultNewsProvider) FilterByImpact(items []news.NewsItem, minImpact int) []news.NewsItem { + filtered := make([]news.NewsItem, 0) + for _, item := range items { + if item.Impact >= minImpact { + filtered = append(filtered, item) + } + } + return filtered +} + +// FilterByTime 按时间过滤新闻（只保留最近N小时的） +func (p *DefaultNewsProvider) FilterByTime(items []news.NewsItem, hours int) []news.NewsItem { + cutoff := time.Now().Add(-time.Duration(hours) * time.Hour) + filtered := make([]news.NewsItem, 0) + for _, item := range items { + if item.PublishedAt.After(cutoff) { + filtered = append(filtered, item) + } + } + return filtered +} diff --git a/news/provider/telegram/telegram.go b/news/provider/telegram/telegram.go new file mode 100644 index 000000000..821cefa58 --- /dev/null +++ b/news/provider/telegram/telegram.go @@ -0,0 +1,299 @@ +package telegram + +import ( + "fmt" + "io" + "net/http" + "net/url" + "nofx/news" + "regexp" + "strings" + "time" + + "github.com/PuerkitoBio/goquery" + "github.com/samber/lo" +) + +// Message 表示 Telegram 消息结构 +type Message struct { + MessageID string `json:"messageId"` + Title string `json:"title"` + Content string `json:"content"` + PubDate string `json:"pubDate"` + Image string `json:"image"` + Tags []string `json:"tags"` +} + +// ToNews 转新闻结构 +func (m Message) ToNews() news.NewsItem { + return news.NewsItem{ + Symbol: "", + Headline: m.Title, + Summary: m.Content, + PublishedAt: time.Now(), + } +} + +// Channel 表示频道配置 +type Channel struct { + ID string `json:"id"` + Name string `json:"name"` +} + +// Searcher Telegram 搜索服务 +type Searcher struct { + client *http.Client + baseURL string + channels []Channel // telegram频道 + keywords []string // 关键词列表,暂时忽略 +} + +// NewSearcher 创建搜索服务实例 +func NewSearcher(baseURL string, proxyURL string, channels []Channel) (*Searcher, error) { + client := &http.Client{ + Timeout: 30 * time.Second, + } + + // 配置代理(如果提供) + if proxyURL != "" { + proxy, err := url.Parse(proxyURL) + if err != nil { + return nil, fmt.Errorf("invalid proxy URL: %w", err) + } + client.Transport = &http.Transport{ + Proxy: http.ProxyURL(proxy), + } + } + + return &Searcher{ + client: client, + baseURL: baseURL, + channels: channels, + keywords: []string{""}, + }, nil +} + +// FetchNews 按币种批量获取最新新闻；返回值按symbol分组 +// +// TODO: 此处未全部实现,当前不分币种,将所有消息返回 +func (s *Searcher) FetchNews(symbols []string, limit int) (map[string][]news.NewsItem, error) { + newsItem := make(map[string][]news.NewsItem) + for _, keyword := range s.keywords { + mapMessages := s.SearchAllChannels(s.channels, keyword) + for symbol, mes := range mapMessages { + newsItem[symbol] = append(newsItem[symbol], lo.Map(mes, func(item Message, _ int) news.NewsItem { return item.ToNews() })...) + } + } + return newsItem, nil +} + +// SearchChannel 搜索单个频道 +func (s *Searcher) SearchChannel(channelID string, keyword string) ([]Message, string, error) { + // 构造搜索 URL + searchURL := fmt.Sprintf("%s/%s", s.baseURL, channelID) + if keyword != "" { + searchURL = fmt.Sprintf("%s?q=%s", searchURL, url.QueryEscape(keyword)) + } + + // 创建 HTTP 请求 + req, err := http.NewRequest("GET", searchURL, nil) + if err != nil { + return nil, "", err + } + + // 设置请求头,模拟浏览器 + req.Header.Set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)") + req.Header.Set("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9") + req.Header.Set("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8") + + // 发送请求 + resp, err := s.client.Do(req) + if err != nil { + return nil, "", fmt.Errorf("request failed: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return nil, "", fmt.Errorf("unexpected status code: %d", resp.StatusCode) + } + + // 解析 HTML + return s.parseHTML(resp.Body) +} + +// parseHTML 解析 HTML 内容 +func (s *Searcher) parseHTML(body io.Reader) ([]Message, string, error) { + doc, err := goquery.NewDocumentFromReader(body) + if err != nil { + return nil, "", fmt.Errorf("failed to parse HTML: %w", err) + } + + var messages []Message + var channelLogo string + + // 提取频道 logo + doc.Find(".tgme_header_link img").Each(func(i int, s *goquery.Selection) { + if src, exists := s.Attr("src"); exists { + channelLogo = src + } + }) + + // 遍历消息 + doc.Find(".tgme_widget_message_wrap").Each(func(i int, sel *goquery.Selection) { + message := s.extractMessage(sel) + messages = append(messages, message) + }) + + return messages, channelLogo, nil +} + +// extractMessage 从 HTML 元素中提取消息信息 +func (s *Searcher) extractMessage(sel *goquery.Selection) Message { + msg := Message{} + + // 提取消息 ID + if dataPost, exists := sel.Find(".tgme_widget_message").Attr("data-post"); exists { + // data-post 格式: "channelId/messageId" + if len(dataPost) > 0 { + parts := splitLast(dataPost, "/") + if len(parts) == 2 { + msg.MessageID = parts[1] + } + } + } + + // 提取消息文本 + messageText := sel.Find(".js-message_text") + if messageText.Length() > 0 { + html, _ := messageText.Html() + + // 提取标题(第一行) + if html != "" { + lines := splitFirst(html, "
") + if len(lines) > 0 { + msg.Title = stripHTML(lines[0]) + } + + // 提取内容(去除标题后的文本) + if len(lines) > 1 { + msg.Content = stripHTML(lines[1]) + } + } + } + + // 提取发布时间 + if datetime, exists := sel.Find("time").Attr("datetime"); exists { + msg.PubDate = datetime + } + + // 提取图片 + if style, exists := sel.Find(".tgme_widget_message_photo_wrap").Attr("style"); exists { + msg.Image = extractImageURL(style) + } + + // 提取标签 + sel.Find(".tgme_widget_message_text a").Each(func(i int, s *goquery.Selection) { + text := s.Text() + if len(text) > 0 && text[0] == '#' { + msg.Tags = append(msg.Tags, text) + } + }) + + return msg +} + +// SearchAllChannels 并行搜索多个频道 +func (s *Searcher) SearchAllChannels(channels []Channel, keyword string) map[string][]Message { + type result struct { + channelID string + messages []Message + logo string + err error + } + + resultChan := make(chan result, len(channels)) + + // 并行搜索 + for _, channel := range channels { + go func(ch Channel) { + messages, logo, err := s.SearchChannel(ch.ID, keyword) + resultChan <- result{ + channelID: ch.ID, + messages: messages, + logo: logo, + err: err, + } + }(channel) + } + + // 收集结果 + results := make(map[string][]Message) + for i := 0; i < len(channels); i++ { + res := <-resultChan + if res.err == nil { + results[res.channelID] = res.messages + } + } + + return results +} + +// splitFirst 在第一个分隔符处分割字符串，返回最多两个部分 +func splitFirst(s, sep string) []string { + // 使用 SplitN 限制分割次数为 2 + // 当 n=2 时，返回的切片最多包含两个元素 + result := strings.SplitN(s, sep, 2) + + // 如果字符串中不包含分隔符，SplitN 会返回包含原字符串的切片 + // 这符合预期行为，直接返回即可 + return result +} + +// splitLast 在最后一个分隔符处分割字符串，返回最多两个部分 +func splitLast(s, sep string) []string { + // 查找最后一个分隔符的位置 + index := strings.LastIndex(s, sep) + + if index < 0 { + // 如果没有找到分隔符，返回包含原字符串的切片 + return []string{s} + } + + // 根据最后一个分隔符的位置分割字符串 + part1 := s[:index] + part2 := s[index+len(sep):] + + return []string{part1, part2} +} + +// stripHTML 移除字符串中的所有 HTML 标签，只保留纯文本 +func stripHTML(s string) string { + // 将HTML标签全转换成小写（确保匹配大小写不敏感的标签） + re := regexp.MustCompile(`\<[\S\s]+?\>`) + s = re.ReplaceAllStringFunc(s, strings.ToLower) + + // 去除