From a1db6b764c5b85cf595ae4dd8662ed6418417352 Mon Sep 17 00:00:00 2001 From: danial Date: Wed, 10 Dec 2025 21:56:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(card=5Fsender):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=A3=9E=E9=B1=BC=E6=9F=A5=E8=AF=A2=E5=93=8D=E5=BA=94=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 精简飞鱼查询返回日志内容，移除冗余字段 - 保留原始响应字符串以便排查问题 - 保持对频繁操作消息的判定逻辑不变 - 避免过多日志数据导致日志膨胀 perf(deploy): 优化代理请求数量及协程池容量 - 将Dockerfile中proxyUrl请求数从2改为1，减少请求量 - 扫描控制器中延迟处理、提交限制和提交池容量分别从20、20、300增至50、50、500 - 绑定订单逻辑中发送卡片任务循环次数由10调整为3，优化性能 - 移除多余的错误日志打印，减少冗余日志输出 fix(pool): 修复飞鱼查询日志字段输出问题 - 将日志字段 "respRawData" 类型调整为字符串类型，避免类型不匹配 - 修改日志中布尔字段名为 "operation"，更准确表达含义 - 保持日志内容详尽，方便后续问题排查 - 更新 Go 版本至 1.25.5 以保持依赖更新 --- .tool-versions | 2 +- deploy/Dockerfile | 2 +- internal/controllers/scan_controller.go | 6 +++--- .../supplier/third_party/pool/card_sender/flyfishv2.go | 3 +-- internal/service/supplier/third_party/pool/service.go | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.tool-versions b/.tool-versions index 010d49f..309ff5c 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.25.3 +golang 1.25.5 diff --git a/deploy/Dockerfile b/deploy/Dockerfile index a849687..82f982d 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -22,7 +22,7 @@ ENV TZ=Asia/Shanghai \ shopAddr="" \ proxy="" \ proxyName="qkgo" \ - proxyUrl="https://share.proxy.qg.net/get?key=E4WS5YZV&num=2&area=&isp=0&format=txt&seq=\n&distinct=true" \ + proxyUrl="https://share.proxy.qg.net/get?key=E4WS5YZV&num=1&area=&isp=0&format=txt&seq=\n&distinct=true" \ proxyAuthKey="E4WS5YZV" \ proxyAuthPwd="C474B2794C4E" diff --git a/internal/controllers/scan_controller.go b/internal/controllers/scan_controller.go index 0138f6e..b6f0cae 100644 --- a/internal/controllers/scan_controller.go +++ b/internal/controllers/scan_controller.go @@ -37,9 +37,9 @@ import ( ) var ( - delayPool = gopool.NewPool("delayHandler", 20, gopool.NewConfig()) - submitLimiterPool = gopool.NewPool("submitLimiterPool", 20, gopool.NewConfig()) - submitPool = gopool.NewPool("submitPool", 300, gopool.NewConfig()) + delayPool = gopool.NewPool("delayHandler", 50, gopool.NewConfig()) + submitLimiterPool = gopool.NewPool("submitLimiterPool", 50, gopool.NewConfig()) + submitPool = gopool.NewPool("submitPool", 500, gopool.NewConfig()) ) var orderSubmitLimiter sync.Map diff --git a/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go b/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go index 9a9872c..b38e71b 100644 --- a/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go +++ b/internal/service/supplier/third_party/pool/card_sender/flyfishv2.go @@ -163,8 +163,7 @@ func (s *SendCardTaskTypeFlyFishV2) HandleSendCardTask(ctx context.Context, orde Message string `json:"message"` }{} err = json.Unmarshal(resp.Body(), &respData) - otelTrace.Logger.WithContext(ctx).Info("飞鱼查询返回", zap.Any("respRawData", resp.String()), zap.Any("formData", formData), - zap.Bool("success", strings.Contains(respData.Message, "频繁操作")), zap.Any("respData", respData)) + otelTrace.Logger.WithContext(ctx).Info("飞鱼查询返回", zap.String("respRawData", resp.String())) if strings.Contains(respData.Message, "频繁操作") { return errors.New("重新下单提交卡密") } diff --git a/internal/service/supplier/third_party/pool/service.go b/internal/service/supplier/third_party/pool/service.go index e2d502e..7fea803 100644 --- a/internal/service/supplier/third_party/pool/service.go +++ b/internal/service/supplier/third_party/pool/service.go @@ -554,7 +554,7 @@ func (s *OrderPoolServiceImpl) SubmitOrder(ctx context.Context, task card_sender var orderItem card_sender.OrderPoolItem - for range 10 { + for range 3 { orderItem, err := task.SendCardTaskType.GetSendCardTaskType(). CreateOrder(ctx, task.RoadUid, task.CardInfo.GetFaceTypeFloat(ctx)) @@ -572,7 +572,6 @@ func (s *OrderPoolServiceImpl) SubmitOrder(ctx context.Context, task card_sender return fmt.Errorf("绑定订单ID和卡片信息ID失败: %v", err) } err = task.SendCardTaskType.GetSendCardTaskType().HandleSendCardTask(ctx, orderItem, task) - otelTrace.Logger.WithContext(ctx).Error("提交返回错误", zap.Error(err)) if err != nil { if strings.Contains(err.Error(), "重新下单") { continue