S4-D1/D2: C1 回调推送引擎+C2 上行自动拉黑——验收项「死信可查/拒收即拉黑」✅: ①C1=callback_task 队列表(迁移 v21,状态机 pending→sent/dead+attempt/next_retry_at/last_code)+PushWorker(2s 扫/批 100/并发 8/2^n 秒指数退避封顶 10min/10 次耗尽死信/UPDATE CAS 防竞态)+双挂点(report 终态首锁[Consumer+PairService,与 CMPP Deliver 同点同语义]+uplink 消费尾)+URL 门控 account_config.report_url/uplink_url(60s TTL 缓存,未配置零任务)+GET /ops/callback(列表+状态计数面板)/POST /ops/callback/:id/resend(casbin ops callback:read/write v21 所种)+前端回调管理页(ops-callback 路由系统管理组+api/callback.ts+状态面板/筛选/载荷展开/死信重派;matrix+guard 33 菜单显式更)+metrics callback_push_total{type,result}/blacklist_total+openapi v1.4.0;②C2=AutoBlacklister 等值词表(trim+lower 防误伤,默认 R/TD/退订/拒收;SystemConfig uplink.blacklist.keywords 可配 60s 刷新)→policy_blacklist(source=2/账号级/uk 幂等)+Redis Set 即时生效,拉黑不影响上行推送(需求原文);③真机全链六步实证(dev 中间件):回执 DELIVRD→detail 终态→HTTP 回调 JSON 送达(200/sent)+上行 R→拉黑(source=2+Redis=1)+推送送达+坏 URL→attempt10→dead→resend ISC:000→修复重投 sent+status_counts 面板;一次性探针 cmd/cbprobe 用后即删+冒烟数据全清;④单测 +13(callback 6[入队门控/载荷/状态机全链/并发批]+uplink 5[词表/配置覆盖/幂等缓存/消费链]+report 2[首锁一次/nil]);⑤门禁=build/vet/-race 40 包/lint 0/eslint0/vue-tsc0/vitest 148/build 全绿;迁移测试 v15..v21 两遍幂等+dev 实跑 v21;gofmt 存量 8 文件顺手清零(S2 遗留);⑥口径诚实标注:载荷无签名挂账/拦截终态 HTTP 未挂(CMPP 侧已有)/PushWorker 单实例 at-least-once;验收单 s4-d1d2-callback.md+CHANGELOG+memory-bank 回填
ci / test (push) Canceled after 0s
ci / web-test (push) Canceled after 0s
ci / build (push) Canceled after 0s
ci / deploy-dev (push) Canceled after 0s

This commit is contained in:
2026-11-16 11:19:55 +08:00
parent 4e7f77a41a
commit bb60d60529
36 changed files with 1544 additions and 52 deletions
+18 -3
View File
@@ -21,6 +21,7 @@ import (
"go-sms/internal/pkg/queue"
"go-sms/internal/service/audit"
"go-sms/internal/service/balance"
"go-sms/internal/service/callback"
"go-sms/internal/service/channel"
"go-sms/internal/service/interceptor"
"go-sms/internal/service/report"
@@ -193,13 +194,27 @@ func main() {
zap.Bool("pacer", pacer.Open()),
zap.String("reclaim", reclaimEvery.String()), zap.Bool("lag_reader", lagErr == nil))
// S4·C1/C2:回调推送引擎(HTTP 回执终态+上行推送,指数退避+死信可查)
// + 上行自动拉黑(词表 SystemConfig 可配,拒收即拉黑)。
cbSvc := callback.NewService(db)
upBl := uplink.NewAutoBlacklister(db, rc)
blCtx, stopBl := context.WithCancel(context.Background())
go upBl.Start(blCtx)
a.OnShutdown(stopBl)
cbW := callback.NewPushWorker(db)
cbWCtx, stopCbW := context.WithCancel(context.Background())
go cbW.Run(cbWCtx, callback.DefaultScanEvery)
a.OnShutdown(stopCbW)
a.Lg().Info("callback_engine_ready",
zap.Bool("blacklist", true), zap.Duration("scan_every", callback.DefaultScanEvery))
// Day 49:上行消费组(sms-up;15 天窗口匹配下行明细回填 match_task_id;
// 客户推送/自动拉黑属阶段 5 Day54)。独立 group 前缀防 offset 互扰。
// S4:上行推送+自动拉黑挂消费尾部,不阻断匹配主链)。独立 group 前缀防 offset 互扰。
upTopic := cfg.Kafka.Topics["up"]
if upTopic == "" {
upTopic = queue.TopicUp
}
uc := uplink.NewConsumer(db)
uc := uplink.NewConsumer(db).WithCallback(cbSvc).WithBlacklist(upBl)
ucg, err := queue.NewConsumerGroup(queue.ConsumerGroupConfig{
Consumer: queue.ConsumerConfig{
Brokers: cfg.Kafka.Brokers,
@@ -256,7 +271,7 @@ func main() {
go comp.Run(compCtx, 10*time.Minute)
a.OnShutdown(stopComp)
repC := report.NewConsumer(db).WithBilling(bill)
repC := report.NewConsumer(db).WithBilling(bill).WithCallback(cbSvc) // S4·C1:回执终态 HTTP 回调入队
// Day 61(P0.5):CMPP 回执协议侧下发桥——终态锁定后投 cmpp-deliver
// (gateway 进程消费→PushDeliver);producer 缺省时不注入(HTTP 来源无此诉求)。
if p := a.Producer(); p != nil {
+6 -1
View File
@@ -25,6 +25,7 @@ import (
"go-sms/internal/service/audit"
"go-sms/internal/service/auth"
"go-sms/internal/service/balance"
"go-sms/internal/service/callback"
"go-sms/internal/service/channel"
"go-sms/internal/service/interceptor"
"go-sms/internal/service/openapi"
@@ -205,7 +206,9 @@ func main() {
}
// 阶段5收尾(D28 挂账清偿):回执重推+手动配对服务(终态链复用
// consumer 同款 finalizeDetail 单一实现;计费走 balStore 同一 Store)。
pairSvc := report.NewPairService(db, report.NewBilling(db, balStore), sf)
// S4·C1:手动配对终态同步入 HTTP 回调(与 consumer 回执链同挂点)。
cbSvc := callback.NewService(db)
pairSvc := report.NewPairService(db, report.NewBilling(db, balStore), sf).WithCallback(cbSvc)
if p := a.Producer(); p != nil {
pairSvc = pairSvc.WithPushSink(&report.ProducerPushSink{P: p})
}
@@ -236,6 +239,8 @@ func main() {
Pair: pairSvc,
// S2:结算域(D2=消耗日汇总;充值审核/月结/阶梯/利润随 D3~D5 追加)
Settle: settle.NewService(db),
// S4·C1:/ops/callback 死信查询与重派(管理面;投递在 consumer 进程)
Callback: cbSvc,
})
// Day68:运营总览汇总刷新(回补 30 天+60s ticker 增量 UPSERT stats_daily;
// 幂等多实例无害,详见 stats_handler.go StartStatsRefresher)。