fix: 不轮询清单审查问题
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m31s
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 9m31s
- 写清单 ON CONFLICT 的部分索引谓词改为字面量:预编译语句的通用执行计划下参数化谓词匹配不到部分唯一索引,第 6 次起关闭轮询全部失败 - 轮询开关审计允许 Worker、开放接口、C 端与支付回调来源;导入与自动恢复补审计操作者 - 文件导入按 19/20 位 ICCID 匹配 - 钱包重复支付不再恢复轮询 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -98,7 +98,12 @@ func NewRegistry() *Registry {
|
||||
{Actor: constants.AuditActorPersonalCustomer, Source: constants.AuditSourcePersonalAPI},
|
||||
{Actor: constants.AuditActorExternalSystem, Source: constants.AuditSourceCallback},
|
||||
}
|
||||
// 轮询开关可由后台人工、文件导入 Worker、订单套餐生效(C 端、开放接口、支付回调)与改有效期触发,均需留下审计事实。
|
||||
iotCardPollingStatusUpdated.AllowedActor, iotCardPollingStatusUpdated.Source = "", ""
|
||||
iotCardPollingStatusUpdated.AllowedOrigins = pollingToggleOrigins()
|
||||
iotCardPollingStatusBatchUpdated := iotCardBatchAction(constants.AuditActionIotCardPollingStatusBatchUpdated, "批量更新 IoT 卡轮询开关")
|
||||
iotCardPollingStatusBatchUpdated.AllowedActor, iotCardPollingStatusBatchUpdated.Source = "", ""
|
||||
iotCardPollingStatusBatchUpdated.AllowedOrigins = pollingToggleOrigins()
|
||||
iotCardBatchDeleted := ActionDefinition{
|
||||
Code: constants.AuditActionIotCardBatchDeleted, Name: "批量删除 IoT 卡",
|
||||
Category: constants.AuditCategoryAsset, Risk: constants.AuditRiskHigh,
|
||||
@@ -135,6 +140,8 @@ func NewRegistry() *Registry {
|
||||
deviceDeactivated := deviceAction(constants.AuditActionDeviceDeactivated, "停用设备资产", constants.AuditActorAccount, constants.AuditSourceAdminAPI)
|
||||
deviceDeactivated.Risk = constants.AuditRiskHigh
|
||||
devicePollingStatusUpdated := deviceAction(constants.AuditActionDevicePollingStatusUpdated, "更新设备轮询开关", constants.AuditActorAccount, constants.AuditSourceAdminAPI)
|
||||
devicePollingStatusUpdated.AllowedActor, devicePollingStatusUpdated.Source = "", ""
|
||||
devicePollingStatusUpdated.AllowedOrigins = pollingToggleOrigins()
|
||||
deviceAllocationBatch := deviceMultiOriginBatchAction(constants.AuditActionDeviceAllocationBatch, "批量分配设备")
|
||||
deviceAllocated := deviceMultiOriginAction(constants.AuditActionDeviceAllocated, "分配设备")
|
||||
deviceRecallBatch := deviceMultiOriginBatchAction(constants.AuditActionDeviceRecallBatch, "批量回收设备")
|
||||
@@ -1707,3 +1714,15 @@ func (r *Registry) Resource(resourceType string) (ResourceDefinition, bool) {
|
||||
resource, ok := r.resources[resourceType]
|
||||
return resource, ok
|
||||
}
|
||||
|
||||
// pollingToggleOrigins 是轮询开关变更允许的审计来源(后台、Worker、开放接口、C 端、支付回调)。
|
||||
func pollingToggleOrigins() []ActionOrigin {
|
||||
return []ActionOrigin{
|
||||
{Actor: constants.AuditActorAccount, Source: constants.AuditSourceAdminAPI},
|
||||
{Actor: constants.AuditActorSystemTask, Source: constants.AuditSourceWorker},
|
||||
{Actor: constants.AuditActorScheduledJob, Source: constants.AuditSourceScheduler},
|
||||
{Actor: constants.AuditActorOpenAPI, Source: constants.AuditSourceOpenAPI},
|
||||
{Actor: constants.AuditActorPersonalCustomer, Source: constants.AuditSourcePersonalAPI},
|
||||
{Actor: constants.AuditActorExternalSystem, Source: constants.AuditSourceCallback},
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ package pollingpause
|
||||
|
||||
import (
|
||||
"context"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -68,9 +69,10 @@ func Record(ctx context.Context, tx *gorm.DB, change Change, fallback string) er
|
||||
ClosedBy: origin.OperatorID, ClosedAt: now, ImportTaskID: origin.ImportTaskID, CreatedAt: now, UpdatedAt: now,
|
||||
}
|
||||
// 部分唯一索引 (asset_type, asset_id) WHERE status = 1:已有已关闭记录时保留原记录。
|
||||
// 谓词必须写成字面量:启用预编译语句时,参数化的 WHERE 在通用执行计划下无法匹配部分唯一索引。
|
||||
err := tx.WithContext(ctx).Clauses(clause.OnConflict{
|
||||
Columns: []clause.Column{{Name: "asset_type"}, {Name: "asset_id"}},
|
||||
TargetWhere: clause.Where{Exprs: []clause.Expression{clause.Expr{SQL: "status = ?", Vars: []any{constants.PollingPauseStatusClosed}}}},
|
||||
TargetWhere: clause.Where{Exprs: []clause.Expression{clause.Expr{SQL: closedStatusPredicate}}},
|
||||
DoNothing: true,
|
||||
}).Create(row).Error
|
||||
if err != nil {
|
||||
@@ -119,6 +121,9 @@ func RiskEnableDeniedReason(extend string) string {
|
||||
return "风险停机,不能开启轮询"
|
||||
}
|
||||
|
||||
// closedStatusPredicate 是部分唯一索引 uq_card_polling_pause_open 的谓词字面量。
|
||||
var closedStatusPredicate = "status = " + strconv.Itoa(constants.PollingPauseStatusClosed)
|
||||
|
||||
func truncate(s string, max int) string {
|
||||
runes := []rune(s)
|
||||
if len(runes) <= max {
|
||||
|
||||
Reference in New Issue
Block a user