All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m46s
【核心变更】
1. 停复机逻辑统一(StopResumeService)
- 新增 EvaluateAndAct 统一入口,封装三条件停复机判断
- 停机条件:无套餐(no_package) / 流量耗尽(traffic_exhausted) / 未实名(not_realname)
- 复机条件:stop_reason 合规 + 有套餐且未耗尽 + 已实名或行业卡
- 修复设备套餐 Bug:hasValidPackage 按 device_id 查套餐,而非仅 iot_card_id
- 设备维度停复机加幂等锁(Redis SetNX,TTL 30s),防止多卡并发重复调 Gateway
2. Redis 分片队列(PollingQueueManager)
- 新建 queue_manager.go,封装所有轮询 Redis 操作
- 16 分片 Sorted Set,Key 格式:polling:shard:{shardID}:queue:{taskType}
- Lua 脚本原子出队(ZRANGEBYSCORE + 分批 ZREM),消除竞态窗口
- 新增背压检测:队列深度超 50 万时 Scheduler 跳过该分片
- RemoveFromAllQueues 覆盖 4 种任务类型(含 protect)
3. Handler 拆分(polling_handler.go 1360行 → 5个专注文件)
- polling_base.go:共享基类(并发控制/卡缓存/重入队)
- polling_realname_handler.go:实名采集,实名 0→1 时立即触发复机
- polling_carddata_handler.go:流量采集,保留跨月边界检测逻辑
- polling_package_handler.go:套餐采集,委托 EvaluateAndAct 决策
- polling_protect_handler.go:保护期一致性检查,保护期内强制修正
4. 配置管理(PollingConfigManager)
- 新建 config_manager.go,从 scheduler.go 提取配置职责
- 内存缓存 + 5 分钟定时刷新,刷新失败保留原缓存
- 修复 getCardCondition:停机卡返回 suspended,不再错配 activated 配置
5. 渐进式初始化(CardInitializer)
- 新建 initializer.go,分批加载(每批 10 万),批次间 sleep 500ms
- 过滤 enable_polling=false 的卡,初始化完成前 Scheduler 不出队
6. 卡生命周期服务(PollingLifecycleService)
- 新建 lifecycle_service.go,替代已删除的 callbacks.go 和 api_callback.go
- OnCardCreated/OnCardEnabled/OnCardStatusChanged 入队前检查 enable_polling
7. Scheduler 精简(1000+行 → 227行)
- 保留纯调度循环:scheduleLoop + processShardSchedule + enqueueBatch
- 保留每 10 秒触发套餐过期检测和流量重置
- 移除所有 DB 操作、配置加载、卡初始化逻辑
8. 轮询管控 API(enable_polling)
- 新增 PUT /api/admin/assets/:id/polling-status 接口
- 支持对设备/卡维度开关轮询,关闭后从所有分片队列移除
9. 数据库迁移
- 000103:tb_device 新增 enable_polling 字段(boolean, NOT NULL, DEFAULT true)
- 000104:新增 suspended 轮询配置,为 activated 配置补全 protect_check_interval
【文件统计】
- 新增:19 个文件(handler × 5、polling 组件 × 4、迁移 × 3 等)
- 修改:20 个文件(bootstrap 注入、store 接口、monitoring 适配分片等)
- 删除:3 个文件(polling_handler.go、callbacks.go、api_callback.go)
Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
124 lines
3.7 KiB
Go
124 lines
3.7 KiB
Go
package bootstrap
|
|
|
|
import (
|
|
"github.com/break/junhong_cmp_fiber/internal/service/commission_calculation"
|
|
"github.com/break/junhong_cmp_fiber/internal/service/commission_stats"
|
|
iotCardSvc "github.com/break/junhong_cmp_fiber/internal/service/iot_card"
|
|
orderSvc "github.com/break/junhong_cmp_fiber/internal/service/order"
|
|
packagepkg "github.com/break/junhong_cmp_fiber/internal/service/package"
|
|
pollingSvc "github.com/break/junhong_cmp_fiber/internal/service/polling"
|
|
"github.com/break/junhong_cmp_fiber/pkg/queue"
|
|
)
|
|
|
|
type workerServices struct {
|
|
CommissionCalculation *commission_calculation.Service
|
|
CommissionStats *commission_stats.Service
|
|
UsageService *packagepkg.UsageService
|
|
ActivationService *packagepkg.ActivationService
|
|
ResetService *packagepkg.ResetService
|
|
AlertService *pollingSvc.AlertService
|
|
CleanupService *pollingSvc.CleanupService
|
|
}
|
|
|
|
func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *queue.WorkerServices {
|
|
commissionStatsService := commission_stats.New(stores.ShopSeriesCommissionStats)
|
|
|
|
commissionCalculationService := commission_calculation.New(
|
|
deps.DB,
|
|
stores.CommissionRecord,
|
|
stores.Shop,
|
|
stores.ShopPackageAllocation,
|
|
stores.ShopSeriesAllocation,
|
|
stores.PackageSeries,
|
|
stores.IotCard,
|
|
stores.Device,
|
|
stores.AgentWallet,
|
|
stores.AgentWalletTransaction,
|
|
stores.Order,
|
|
stores.OrderItem,
|
|
stores.Package,
|
|
stores.ShopSeriesCommissionStats,
|
|
commissionStatsService,
|
|
deps.Logger,
|
|
)
|
|
|
|
usageService := packagepkg.NewUsageService(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.PackageUsage,
|
|
stores.PackageUsageDailyRecord,
|
|
stores.DeviceSimBinding,
|
|
deps.Logger,
|
|
)
|
|
|
|
activationService := packagepkg.NewActivationService(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.PackageUsage,
|
|
stores.Package,
|
|
stores.PackageUsageDailyRecord,
|
|
deps.Logger,
|
|
)
|
|
|
|
resetService := packagepkg.NewResetService(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.PackageUsage,
|
|
deps.Logger,
|
|
)
|
|
|
|
alertService := pollingSvc.NewAlertService(
|
|
stores.PollingAlertRule,
|
|
stores.PollingAlertHistory,
|
|
deps.Redis,
|
|
deps.Logger,
|
|
)
|
|
|
|
cleanupService := pollingSvc.NewCleanupService(
|
|
stores.DataCleanupConfig,
|
|
stores.DataCleanupLog,
|
|
deps.Logger,
|
|
)
|
|
|
|
// 初始化订单服务(仅用于超时自动取消,不需要微信支付和队列客户端)
|
|
orderService := orderSvc.New(
|
|
deps.DB,
|
|
deps.Redis,
|
|
stores.Order,
|
|
stores.OrderItem,
|
|
stores.AgentWallet,
|
|
stores.AssetWallet,
|
|
nil, // purchaseValidationService: 超时取消不需要
|
|
stores.ShopPackageAllocation,
|
|
stores.ShopSeriesAllocation,
|
|
stores.IotCard,
|
|
stores.Device,
|
|
stores.PackageSeries,
|
|
stores.PackageUsage,
|
|
stores.Package,
|
|
nil, // wechatConfigService: 超时取消不需要
|
|
nil, // wechatPayment: 超时取消不需要
|
|
nil, // queueClient: 超时取消不触发分佣
|
|
deps.Logger,
|
|
)
|
|
|
|
// 创建停复机服务并注入回调:流量耗尽自动停机、套餐激活/重置/支付后自动复机
|
|
stopResumeService := iotCardSvc.NewStopResumeService(deps.Redis, stores.IotCard, stores.PackageUsage, stores.DeviceSimBinding, deps.GatewayClient, deps.Logger)
|
|
usageService.SetStopResumeCallback(stopResumeService)
|
|
activationService.SetResumeCallback(stopResumeService)
|
|
orderService.SetResumeCallback(stopResumeService)
|
|
resetService.SetResumeCallback(stopResumeService)
|
|
|
|
return &queue.WorkerServices{
|
|
CommissionCalculation: commissionCalculationService,
|
|
CommissionStats: commissionStatsService,
|
|
UsageService: usageService,
|
|
ActivationService: activationService,
|
|
ResetService: resetService,
|
|
AlertService: alertService,
|
|
CleanupService: cleanupService,
|
|
StopResumeService: stopResumeService,
|
|
OrderExpirer: orderService,
|
|
}
|
|
}
|