feat: 卡网关按运营商账户限流并记录停复机调用
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m33s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m33s
- 新增网关限流:按本系统运营商账户(卡 carrier_id)→ 限流组 → 操作限制每秒请求数,每次 HTTP 尝试计量,默认限流、仅后台人工点击/通道阈值/自动续费/手动刷新豁免;支持只统计与拦截两种模式,默认只统计 - Asynq 遇限流不计失败、固定短延迟重试;轮询任务与停复机业务重试遇限流短延迟重排 - 停机、复机不再使用网关内部重试,只发一次请求 - 网关返回结构化错误;新增上游错误分类规则表与测试接口 - 新增按月分区的停复机记录表:系统自动停复机只写记录,不再写统一审计与集成日志;普通轮询查询不再写集成日志 - 新增限流组、错误分类、停复机记录、按账户调用统计与枚举后台接口 - 迁移 000243~000246;同步 OpenSpec 提案(含后续 6 个 change)与技术方案、工程约束
This commit is contained in:
@@ -15,6 +15,7 @@ import (
|
||||
|
||||
"github.com/break/junhong_cmp_fiber/internal/gateway"
|
||||
auditinfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/audit"
|
||||
"github.com/break/junhong_cmp_fiber/internal/infrastructure/gatewaylimit"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model"
|
||||
"github.com/break/junhong_cmp_fiber/internal/model/dto"
|
||||
packageexpiry "github.com/break/junhong_cmp_fiber/internal/query/packageexpiry"
|
||||
@@ -28,6 +29,7 @@ import (
|
||||
)
|
||||
|
||||
type Service struct {
|
||||
stopResumeRecorder *gatewaylimit.StopResumeRecorder
|
||||
db *gorm.DB
|
||||
redis *redis.Client
|
||||
deviceStore *postgres.DeviceStore
|
||||
@@ -1440,7 +1442,9 @@ func (s *Service) StopDevice(ctx context.Context, deviceID uint) (*dto.DeviceSus
|
||||
log.Info("调用网关停机(设备)",
|
||||
zap.Uint("device_id", deviceID),
|
||||
zap.String("iccid", card.ICCID))
|
||||
gwErr := s.gatewayClient.StopCard(gateway.WithAttemptObserver(ctx, observer), &gateway.CardOperationReq{CardNo: card.ICCID})
|
||||
callStartedAt := time.Now()
|
||||
gwErr := s.gatewayClient.StopCard(gateway.WithCarrier(gateway.WithAttemptObserver(ctx, observer), card.CarrierID), &gateway.CardOperationReq{CardNo: card.ICCID})
|
||||
s.recordCardCommand(ctx, card, constants.StopResumeActionStop, constants.StopReasonManual, gwErr, time.Since(callStartedAt))
|
||||
integrationID = observer.integration
|
||||
if gwErr != nil {
|
||||
log.Error("设备停机-调网关停机失败",
|
||||
@@ -1601,7 +1605,9 @@ func (s *Service) StartDevice(ctx context.Context, deviceID uint) error {
|
||||
log.Info("调用网关复机(设备)",
|
||||
zap.Uint("device_id", deviceID),
|
||||
zap.String("iccid", card.ICCID))
|
||||
gwErr := s.gatewayClient.StartCard(gateway.WithAttemptObserver(ctx, observer), &gateway.CardOperationReq{CardNo: card.ICCID})
|
||||
callStartedAt := time.Now()
|
||||
gwErr := s.gatewayClient.StartCard(gateway.WithCarrier(gateway.WithAttemptObserver(ctx, observer), card.CarrierID), &gateway.CardOperationReq{CardNo: card.ICCID})
|
||||
s.recordCardCommand(ctx, card, constants.StopResumeActionStart, "", gwErr, time.Since(callStartedAt))
|
||||
integrationID = observer.integration
|
||||
if gwErr != nil {
|
||||
log.Error("设备复机-调网关复机失败",
|
||||
@@ -1757,3 +1763,24 @@ func (s *Service) updateCardAndAppendNetworkSeries(
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
// SetStopResumeRecorder 注入停复机记录写入器;设备停复机每次上游调用写一条记录。
|
||||
func (s *Service) SetStopResumeRecorder(recorder *gatewaylimit.StopResumeRecorder) {
|
||||
s.stopResumeRecorder = recorder
|
||||
}
|
||||
|
||||
// recordCardCommand 写设备下单卡的停复机记录;停复机只发一次请求,尝试序号恒为 1。
|
||||
func (s *Service) recordCardCommand(ctx context.Context, card *model.IotCard, action, reason string, callErr error, duration time.Duration) {
|
||||
if s.stopResumeRecorder == nil || card == nil {
|
||||
return
|
||||
}
|
||||
source := gateway.RateLimitExemptSource(ctx)
|
||||
if source == "" {
|
||||
source = constants.AuditSourceWorker
|
||||
}
|
||||
s.stopResumeRecorder.Record(ctx, gatewaylimit.StopResumeRecordInput{
|
||||
CardID: card.ID, ICCID: card.ICCID, CarrierID: card.CarrierID, Action: action,
|
||||
Source: source, Scene: "device_command", Reason: reason, CommandID: deviceCommandSeriesKey(ctx),
|
||||
Attempt: 1, CallErr: callErr, Duration: duration,
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user