全局审计完成

2026-08-07 11:02:52 +08:00
parent 88cc5e96ec
commit c64f3d8b80
94 changed files with 8641 additions and 6714 deletions
--- a/internal/bootstrap/handlers.go
+++ b/internal/bootstrap/handlers.go
@@ -263,12 +263,13 @@ func initHandlers(svc *services, deps *Dependencies) *Handlers {
 		Asset: func() *admin.AssetHandler {
 			pollingQueueMgr := pollingPkg.NewPollingQueueManager(deps.Redis, constants.PollingShardCount, deps.Logger)
 			assetPollingSvc := pollingSvcPkg.NewAssetPollingService(
+				deps.DB,
 				deviceStore,
 				deviceSimBindingStore,
 				svc.IotCard,
 				pollingQueueMgr,
 				deps.Logger,
-				svc.AssetAudit,
+				svc.AccessAudit,
 			)
 			h := admin.NewAssetHandler(svc.Asset, svc.AssetAudit, svc.Device, svc.IotCard, svc.StopResumeService, assetPollingSvc, assetQuery.NewExchangeTraceQuery(deps.DB, deps.Logger))
 			h.SetLifecycleService(svc.AssetLifecycle)
--- a/internal/bootstrap/services.go
+++ b/internal/bootstrap/services.go
@@ -22,7 +22,6 @@ import (
 	wecomInfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/wecom"
 	"github.com/break/junhong_cmp_fiber/internal/polling"
 	accountSvc "github.com/break/junhong_cmp_fiber/internal/service/account"
-	accountAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/account_audit"
 	agentOpenAPISvc "github.com/break/junhong_cmp_fiber/internal/service/agent_open_api"
 	assetAllocationRecordSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_allocation_record"
 	assetAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_audit"
@@ -80,7 +79,6 @@ type services struct {
 	AccessAudit                 *auditInfra.Writer
 	Approval                    *approvalApp.CreationService
 	Account                     *accountSvc.Service
-	AccountAudit                *accountAuditSvc.Service
 	AssetAudit                  *assetAuditSvc.Service
 	Role                        *roleSvc.Service
 	Permission                  *permissionSvc.Service
@@ -147,11 +145,10 @@ func initServices(s *stores, deps *Dependencies) *services {
 	customerBinding := customerBindingSvc.New(deps.DB, s.IotCard, s.Device)

 	purchaseValidation := purchaseValidationSvc.New(deps.DB, s.IotCard, s.Device, s.Package, s.ShopPackageAllocation)
-	accountAudit := accountAuditSvc.NewService(s.AccountOperationLog)
 	assetAudit := assetAuditSvc.NewService(s.AssetOperationLog, deps.DB)
 	auditWriter := auditInfra.NewWriter(auditInfra.NewRegistry(), nil)
 	customerBinding.SetAccessAudit(auditWriter)
-	account := accountSvc.New(s.Account, s.Role, s.AccountRole, s.ShopRole, s.Shop, s.Enterprise, accountAudit)
+	account := accountSvc.New(s.Account, s.Role, s.AccountRole, s.ShopRole, s.Shop, s.Enterprise)
 	account.SetLifecycleAudit(deps.DB, auditWriter)
 	account.SetAccessAudit(deps.DB, deps.Redis, auditWriter)
 	account.SetTokenManager(deps.TokenManager)
@@ -169,7 +166,6 @@ func initServices(s *stores, deps *Dependencies) *services {
 		s.PackageSeries,
 		deps.GatewayClient,
 		deps.Logger,
-		assetAudit,
 	)
 	iotCard.SetAccessAudit(auditWriter)
 	cardObservationOutbox := outbox.NewRepository()
@@ -230,7 +226,6 @@ func initServices(s *stores, deps *Dependencies) *services {
 		s.DeviceSimBinding,
 		deps.GatewayClient,
 		deps.Logger,
-		assetAudit,
 	)
 	stopResumeService.SetPollingCallback(pollingLifecycleSvc)
 	stopResumeService.SetObservationSeriesEventWriter(deps.DB, observationSeriesEvents)
@@ -254,7 +249,6 @@ func initServices(s *stores, deps *Dependencies) *services {
 		s.PackageSeries,
 		deps.GatewayClient,
 		s.AssetIdentifier,
-		assetAudit,
 		s.EnterpriseDeviceAuthorization,
 		s.Enterprise,
 	)
@@ -283,7 +277,6 @@ func initServices(s *stores, deps *Dependencies) *services {
 		s.AgentWallet,
 		s.Shop,
 		wechatConfig,
-		accountAudit,
 		operationPassword,
 		deps.Redis,
 		deps.Logger,
@@ -323,7 +316,8 @@ func initServices(s *stores, deps *Dependencies) *services {
 	exchangeService := exchangeSvc.New(deps.DB, s.ExchangeOrder, s.IotCard, s.Device, s.AssetWallet, s.AssetWalletTransaction, s.PackageUsage, s.PackageUsageDailyRecord, s.ResourceTag, customerBinding, deps.Logger)
 	exchangeService.SetShippingCreatedNotifier(exchangeApp.NewShippingCreatedNotifier(exchangeInfra.NewShippingNotificationWriter(outbox.NewRepository())))
 	exchangeService.SetAccessAudit(auditWriter)
-	assetService := assetSvc.New(deps.DB, s.Device, s.IotCard, s.PackageUsage, s.Package, s.PackageSeries, s.DeviceSimBinding, s.Shop, deps.Redis, iotCard, deps.GatewayClient, s.AssetIdentifier, s.Order, s.OrderItem, s.ExchangeOrder, assetAudit)
+	assetService := assetSvc.New(deps.DB, s.Device, s.IotCard, s.PackageUsage, s.Package, s.PackageSeries, s.DeviceSimBinding, s.Shop, deps.Redis, iotCard, deps.GatewayClient, s.AssetIdentifier, s.Order, s.OrderItem, s.ExchangeOrder)
+	assetService.SetAccessAudit(auditWriter)
 	agentOpenAPI := agentOpenAPISvc.New(assetService, packageService, orderService, shopCommission, stopResumeService, device, s.IotCard, s.PackageUsage, s.Package, s.PackageSeries, s.AgentWallet, s.DeviceSimBinding, s.Device)
 	agentOpenAPI.SetObservationSeriesDispatcher(observationSeries)
 	wecomApplicationRepository := wecomInfra.NewApplicationRepository(deps.DB)
@@ -397,7 +391,6 @@ func initServices(s *stores, deps *Dependencies) *services {
 		AccessAudit:      auditWriter,
 		Approval:         approvalCreationService,
 		Account:          account,
-		AccountAudit:     accountAudit,
 		AssetAudit:       assetAudit,
 		Role:             roleService,
 		Permission:       permissionService,
@@ -428,10 +421,10 @@ func initServices(s *stores, deps *Dependencies) *services {
 		EnterpriseDevice:            enterpriseDeviceSvc.New(deps.DB, s.Enterprise, s.Device, s.DeviceSimBinding, s.EnterpriseDeviceAuthorization, s.EnterpriseCardAuthorization, deps.Logger, auditWriter),
 		Authorization:               enterpriseCardSvc.NewAuthorizationService(deps.DB, s.Enterprise, s.IotCard, s.EnterpriseCardAuthorization, deps.Logger, auditWriter),
 		IotCard:                     iotCard,
-		IotCardImport:               iotCardImportSvc.New(deps.DB, s.IotCardImportTask, deps.QueueClient, assetAudit, auditWriter),
+		IotCardImport:               iotCardImportSvc.New(deps.DB, s.IotCardImportTask, deps.QueueClient, auditWriter),
 		ExportTask:                  exportTaskSvc.New(deps.DB, s.ExportTask, deps.QueueClient, deps.StorageService, auditWriter),
 		Device:                      device,
-		DeviceImport:                deviceImportSvc.New(deps.DB, s.DeviceImportTask, deps.QueueClient, assetAudit, auditWriter),
+		DeviceImport:                deviceImportSvc.New(deps.DB, s.DeviceImportTask, deps.QueueClient, auditWriter),
 		AssetAllocationRecord:       assetAllocationRecordSvc.New(deps.DB, s.AssetAllocationRecord, s.Shop, s.Account),
 		Carrier:                     carrierSvc.New(s.Carrier, auditWriter),
 		PackageSeries:               packageSeriesService,
@@ -453,7 +446,7 @@ func initServices(s *stores, deps *Dependencies) *services {
 		PollingCleanup:              pollingSvc.NewCleanupService(s.DataCleanupConfig, s.DataCleanupLog, deps.Logger),
 		PollingManualTrigger:        pollingManualTriggerService,
 		Asset:                       assetService,
-		AssetLifecycle:              assetSvc.NewLifecycleService(deps.DB, s.IotCard, s.Device, assetAudit),
+		AssetLifecycle:              assetSvc.NewLifecycleService(deps.DB, s.IotCard, s.Device, auditWriter),
 		AssetWallet:                 assetWalletSvc.New(s.AssetWallet, s.AssetWalletTransaction),
 		StopResumeService:           stopResumeService,
 		WechatConfig:                wechatConfig,
--- a/internal/bootstrap/stores.go
+++ b/internal/bootstrap/stores.go
@@ -6,7 +6,6 @@ import (

 type stores struct {
 	Account                           *postgres.AccountStore
-	AccountOperationLog               *postgres.AccountOperationLogStore
 	AssetOperationLog                 *postgres.AssetOperationLogStore
 	Shop                              *postgres.ShopStore
 	Role                              *postgres.RoleStore
@@ -79,7 +78,6 @@ type stores struct {
 func initStores(deps *Dependencies) *stores {
 	return &stores{
 		Account:                           postgres.NewAccountStore(deps.DB, deps.Redis),
-		AccountOperationLog:               postgres.NewAccountOperationLogStore(deps.DB),
 		AssetOperationLog:                 postgres.NewAssetOperationLogStore(deps.DB),
 		Shop:                              postgres.NewShopStore(deps.DB, deps.Redis),
 		Role:                              postgres.NewRoleStore(deps.DB),
--- a/internal/bootstrap/worker_services.go
+++ b/internal/bootstrap/worker_services.go
@@ -8,7 +8,6 @@ import (
 	"github.com/break/junhong_cmp_fiber/internal/infrastructure/integrationlog"
 	"github.com/break/junhong_cmp_fiber/internal/infrastructure/messaging/outbox"
 	walletinfra "github.com/break/junhong_cmp_fiber/internal/infrastructure/wallet"
-	assetAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_audit"
 	"github.com/break/junhong_cmp_fiber/internal/service/commission_calculation"
 	"github.com/break/junhong_cmp_fiber/internal/service/commission_stats"
 	deviceSvc "github.com/break/junhong_cmp_fiber/internal/service/device"
@@ -31,7 +30,6 @@ type workerServices struct {
 }

 func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *queue.WorkerServices {
-	assetAudit := assetAuditSvc.NewService(stores.AssetOperationLog, deps.DB)
 	auditWriter := auditInfra.NewWriter(auditInfra.NewRegistry(), nil)
 	commissionStatsService := commission_stats.New(stores.ShopSeriesCommissionStats)

@@ -105,7 +103,7 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 	iotCardAuditService := iotCardSvc.New(
 		deps.DB, stores.IotCard, stores.Shop, stores.AssetAllocationRecord,
 		stores.ShopPackageAllocation, stores.ShopSeriesAllocation, stores.PackageSeries,
-		deps.GatewayClient, deps.Logger, assetAudit,
+		deps.GatewayClient, deps.Logger,
 	)
 	iotCardAuditService.SetAccessAudit(auditWriter)
 	cardObservationService.SetStateAuditWriter(iotCardAuditService)
@@ -160,7 +158,6 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 		stores.DeviceSimBinding,
 		deps.GatewayClient,
 		deps.Logger,
-		assetAudit,
 	)
 	stopResumeService.SetObservationSeriesEventWriter(deps.DB, observationSeriesEvents)
 	stopResumeService.SetUnifiedAudit(auditWriter, integrationlog.NewRepository(deps.DB))
@@ -172,7 +169,7 @@ func initWorkerServices(stores *queue.WorkerStores, deps *WorkerDependencies) *q
 	deviceBatchAllocator := deviceSvc.New(
 		deps.DB, deps.Redis, stores.Device, stores.DeviceSimBinding, stores.IotCard, stores.Shop,
 		stores.AssetAllocationRecord, stores.ShopPackageAllocation, stores.ShopSeriesAllocation,
-		stores.PackageSeries, deps.GatewayClient, stores.AssetIdentifier, assetAudit, nil, nil,
+		stores.PackageSeries, deps.GatewayClient, stores.AssetIdentifier, nil, nil,
 	)

 	return &queue.WorkerServices{
--- a/internal/bootstrap/worker_stores.go
+++ b/internal/bootstrap/worker_stores.go
@@ -6,7 +6,6 @@ import (
 )

 type workerStores struct {
-	AssetOperationLog          *postgres.AssetOperationLogStore
 	AssetAllocationRecord      *postgres.AssetAllocationRecordStore
 	IotCardImportTask          *postgres.IotCardImportTaskStore
 	IotCard                    *postgres.IotCardStore
@@ -42,7 +41,6 @@ type workerStores struct {

 func initWorkerStores(deps *WorkerDependencies) *queue.WorkerStores {
 	stores := &workerStores{
-		AssetOperationLog:          postgres.NewAssetOperationLogStore(deps.DB),
 		AssetAllocationRecord:      postgres.NewAssetAllocationRecordStore(deps.DB, deps.Redis),
 		IotCardImportTask:          postgres.NewIotCardImportTaskStore(deps.DB, deps.Redis),
 		IotCard:                    postgres.NewIotCardStore(deps.DB, deps.Redis),
@@ -77,7 +75,6 @@ func initWorkerStores(deps *WorkerDependencies) *queue.WorkerStores {
 	}

 	return &queue.WorkerStores{
-		AssetOperationLog:          stores.AssetOperationLog,
 		AssetAllocationRecord:      stores.AssetAllocationRecord,
 		IotCardImportTask:          stores.IotCardImportTask,
 		IotCard:                    stores.IotCard,