From 4d54a4704c12659a4dfb62942d870e909e14b4e2 Mon Sep 17 00:00:00 2001 From: ZhouYongyou <128128010+zhouyongyou@users.noreply.github.com> Date: Sun, 2 Nov 2025 07:11:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B5=B1=E4=B8=80=20handleTraderList=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=8C=E6=95=B4=20AI=20model=20ID=EF=BC=88?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E8=88=87=20handleGetTraderConfig=20=E4=B8=80?= =?UTF-8?q?=E8=87=B4=EF=BC=89=20=E5=95=8F=E9=A1=8C=EF=BC=9A=20-=20handleTr?= =?UTF-8?q?aderList=20=E4=BB=8D=E5=9C=A8=E6=88=AA=E6=96=B7=20AI=20model=20?= =?UTF-8?q?ID=20(admin=5Fdeepseek=20=E2=86=92=20deepseek)=20-=20=E8=88=87?= =?UTF-8?q?=20handleGetTraderConfig=20=E8=BF=94=E5=9B=9E=E7=9A=84=E5=AE=8C?= =?UTF-8?q?=E6=95=B4=20ID=20=E4=B8=8D=E4=B8=80=E8=87=B4=20-=20=E5=B0=8E?= =?UTF-8?q?=E8=87=B4=E5=89=8D=E7=AB=AF=20isModelInUse=20=E6=AA=A2=E6=9F=A5?= =?UTF-8?q?=E5=A4=B1=E6=95=88=20=E4=BF=AE=E5=BE=A9=EF=BC=9A=20-=20?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=20handleTraderList=20=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=88=AA=E6=96=B7=E9=82=8F=E8=BC=AF=20-=20=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=20AIModelID=20(admin=5Fdeepseek)=20-=20?= =?UTF-8?q?=E8=88=87=E5=85=B6=E4=BB=96=20API=20=E7=AB=AF=E9=BB=9E=E4=BF=9D?= =?UTF-8?q?=E6=8C=81=E4=B8=80=E8=87=B4=20=E6=B8=AC=E8=A9=A6=EF=BC=9A=20-?= =?UTF-8?q?=20GET=20/api/traders=20=E2=86=92=20ai=5Fmodel:=20admin=5Fdeeps?= =?UTF-8?q?eek=20=E2=9C=93=20-=20GET=20/api/traders/:id=20=E2=86=92=20ai?= =?UTF-8?q?=5Fmodel:=20admin=5Fdeepseek=20=E2=9C=93=20-=20=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E4=BD=BF=E7=94=A8=E6=AA=A2=E6=9F=A5=E9=82=8F=E8=BC=AF?= =?UTF-8?q?=E6=AD=A3=E7=A2=BA=20=E2=9C=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/server.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/api/server.go b/api/server.go index 94ae4a60..0098a7a3 100644 --- a/api/server.go +++ b/api/server.go @@ -791,19 +791,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,