收口审计治理与套餐任务进展

Constraint: 在线热修前必须保存当前迭代分支全部有效代码进展
Confidence: medium
Scope-risk: broad
Directive: 后续修改需保持审计事件与业务事务边界一致
Tested: git diff --cached --check
Not-tested: 未运行全量测试,提交用于切换分支前保存既有工作
This commit is contained in:
2026-08-05 14:30:54 +08:00
parent b3499adfca
commit 5e552d99bc
178 changed files with 16797 additions and 5674 deletions

View File

@@ -8,6 +8,7 @@ import (
"go.uber.org/zap"
"gorm.io/gorm"
auditinfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/audit"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/model/dto"
"github.com/break/junhong_cmp_fiber/internal/store"
@@ -20,10 +21,18 @@ import (
// ConfigService 轮询配置服务
type ConfigService struct {
configStore *postgres.PollingConfigStore
db *gorm.DB
auditWriter *auditinfra.Writer
redis *redis.Client
logger *zap.Logger
}
// SetAudit 注入轮询配置事务与统一审计 Writer。
func (s *ConfigService) SetAudit(db *gorm.DB, writer *auditinfra.Writer) {
s.db = db
s.auditWriter = writer
}
// NewConfigService 创建轮询配置服务实例
func NewConfigService(configStore *postgres.PollingConfigStore, redisClient *redis.Client, logger *zap.Logger) *ConfigService {
return &ConfigService{configStore: configStore, redis: redisClient, logger: logger}
@@ -48,7 +57,14 @@ func (s *ConfigService) Create(ctx context.Context, req *dto.CreatePollingConfig
// 验证配置名称唯一性
existing, _ := s.configStore.GetByName(ctx, req.ConfigName)
if existing != nil {
return nil, errors.New(errors.CodeInvalidParam, "配置名称已存在")
appErr := errors.New(errors.CodeInvalidParam, "配置名称已存在")
recordPollingFailure(ctx, s.db, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigCreated, Summary: "拒绝创建重复轮询配置",
ResourceType: constants.AuditResourcePollingConfig, ResourceKey: req.ConfigName,
DisplayName: req.ConfigName, OperatorID: currentUserID, Result: constants.AuditResultDenied,
IdentitySnapshot: map[string]any{"config_name": req.ConfigName},
}, appErr)
return nil, appErr
}
// 验证检查间隔(至少一个不为空)
@@ -75,8 +91,26 @@ func (s *ConfigService) Create(ctx context.Context, req *dto.CreatePollingConfig
UpdatedBy: &currentUserID,
}
if err := s.configStore.Create(ctx, config); err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "创建轮询配置失败")
err := runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
if err := s.configStore.WithTx(tx).Create(ctx, config); err != nil {
return err
}
return writePollingAudit(ctx, tx, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigCreated, Summary: "创建轮询配置",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config), AfterData: pollingConfigState(config),
})
})
if err != nil {
appErr := errors.Wrap(errors.CodeInternalError, err, "创建轮询配置失败")
recordPollingFailure(ctx, s.db, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigCreated, Summary: "创建轮询配置失败",
ResourceType: constants.AuditResourcePollingConfig,
ResourceKey: config.ConfigName, DisplayName: config.ConfigName, OperatorID: currentUserID,
IdentitySnapshot: pollingConfigIdentity(config), AfterData: pollingConfigState(config),
}, appErr)
return nil, appErr
}
s.notifyConfigChanged(ctx, "created")
@@ -109,13 +143,22 @@ func (s *ConfigService) Update(ctx context.Context, id uint, req *dto.UpdatePoll
}
return nil, errors.Wrap(errors.CodeInternalError, err, "获取轮询配置失败")
}
before := *config
// 更新字段
if req.ConfigName != nil {
// 检查名称唯一性
existing, _ := s.configStore.GetByName(ctx, *req.ConfigName)
if existing != nil && existing.ID != id {
return nil, errors.New(errors.CodeInvalidParam, "配置名称已存在")
appErr := errors.New(errors.CodeInvalidParam, "配置名称已存在")
recordPollingFailure(ctx, s.db, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigUpdated, Summary: "拒绝更新为重复轮询配置名称",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, Result: constants.AuditResultDenied,
IdentitySnapshot: pollingConfigIdentity(config), BeforeData: pollingConfigState(config),
}, appErr)
return nil, appErr
}
config.ConfigName = *req.ConfigName
}
@@ -151,8 +194,28 @@ func (s *ConfigService) Update(ctx context.Context, id uint, req *dto.UpdatePoll
}
config.UpdatedBy = &currentUserID
if err := s.configStore.Update(ctx, config); err != nil {
return nil, errors.Wrap(errors.CodeInternalError, err, "更新轮询配置失败")
err = runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
if err := s.configStore.WithTx(tx).Update(ctx, config); err != nil {
return err
}
return writePollingAudit(ctx, tx, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigUpdated, Summary: "更新轮询配置",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config),
BeforeData: pollingConfigState(&before), AfterData: pollingConfigState(config),
})
})
if err != nil {
appErr := errors.Wrap(errors.CodeInternalError, err, "更新轮询配置失败")
recordPollingFailure(ctx, s.db, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigUpdated, Summary: "更新轮询配置失败",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config),
BeforeData: pollingConfigState(&before), AfterData: pollingConfigState(config),
}, appErr)
return nil, appErr
}
s.notifyConfigChanged(ctx, "updated")
@@ -161,7 +224,11 @@ func (s *ConfigService) Update(ctx context.Context, id uint, req *dto.UpdatePoll
// Delete 删除轮询配置
func (s *ConfigService) Delete(ctx context.Context, id uint) error {
_, err := s.configStore.GetByID(ctx, id)
currentUserID := middleware.GetUserIDFromContext(ctx)
if currentUserID == 0 {
return errors.New(errors.CodeUnauthorized, "未授权访问")
}
config, err := s.configStore.GetByID(ctx, id)
if err != nil {
if err == gorm.ErrRecordNotFound {
return errors.New(errors.CodePollingConfigNotFound, "轮询配置不存在")
@@ -169,8 +236,26 @@ func (s *ConfigService) Delete(ctx context.Context, id uint) error {
return errors.Wrap(errors.CodeInternalError, err, "获取轮询配置失败")
}
if err := s.configStore.Delete(ctx, id); err != nil {
return errors.Wrap(errors.CodeInternalError, err, "删除轮询配置失败")
err = runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
if err := s.configStore.WithTx(tx).Delete(ctx, id); err != nil {
return err
}
return writePollingAudit(ctx, tx, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigDeleted, Summary: "删除轮询配置",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config), BeforeData: pollingConfigState(config),
})
})
if err != nil {
appErr := errors.Wrap(errors.CodeInternalError, err, "删除轮询配置失败")
recordPollingFailure(ctx, s.db, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigDeleted, Summary: "删除轮询配置失败",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config), BeforeData: pollingConfigState(config),
}, appErr)
return appErr
}
s.notifyConfigChanged(ctx, "deleted")
@@ -228,7 +313,7 @@ func (s *ConfigService) UpdateStatus(ctx context.Context, id uint, status int16)
return errors.New(errors.CodeUnauthorized, "未授权访问")
}
_, err := s.configStore.GetByID(ctx, id)
config, err := s.configStore.GetByID(ctx, id)
if err != nil {
if err == gorm.ErrRecordNotFound {
return errors.New(errors.CodePollingConfigNotFound, "轮询配置不存在")
@@ -236,8 +321,29 @@ func (s *ConfigService) UpdateStatus(ctx context.Context, id uint, status int16)
return errors.Wrap(errors.CodeInternalError, err, "获取轮询配置失败")
}
if err := s.configStore.UpdateStatus(ctx, id, status, currentUserID); err != nil {
return errors.Wrap(errors.CodeInternalError, err, "更新轮询配置状态失败")
before := pollingConfigState(config)
err = runPollingTransaction(ctx, s.db, s.auditWriter, func(tx *gorm.DB) error {
if err := s.configStore.WithTx(tx).UpdateStatus(ctx, id, status, currentUserID); err != nil {
return err
}
config.Status = status
return writePollingAudit(ctx, tx, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigStatusUpdated, Summary: "更新轮询配置状态",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config),
BeforeData: before, AfterData: pollingConfigState(config),
})
})
if err != nil {
appErr := errors.Wrap(errors.CodeInternalError, err, "更新轮询配置状态失败")
recordPollingFailure(ctx, s.db, s.auditWriter, auditinfra.PollingInput{
ActionCode: constants.AuditActionPollingConfigStatusUpdated, Summary: "更新轮询配置状态失败",
ResourceType: constants.AuditResourcePollingConfig, ResourceID: config.ID,
ResourceKey: pollingManualTriggerKey(config.ID), DisplayName: config.ConfigName,
OperatorID: currentUserID, IdentitySnapshot: pollingConfigIdentity(config), BeforeData: before,
}, appErr)
return appErr
}
s.notifyConfigChanged(ctx, "updated")