修改domain包

internal/core/application.go

@@ -57,8 +57,8 @@ func NewApplication(configPath string) (*Application, error) {
 		appServices.deviceService,
 		appServices.planService,
 		appServices.userService,
-		infra.tokenService,
 		appServices.auditService,
+		infra.tokenGenerator,
 		infra.lora.listenHandler,
 	)
 
@@ -91,7 +91,7 @@ func (app *Application) Start() error {
 	}
 
 	// 3. 启动后台工作协程
-	app.Domain.planService.Start()
+	app.Domain.planService.Start(startCtx)
 
 	// 4. 启动 API 服务器
 	app.API.Start()
@@ -107,14 +107,14 @@ func (app *Application) Start() error {
 
 // Stop 优雅地关闭应用的所有组件。
 func (app *Application) Stop() error {
-	logger := logs.TraceLogger(app.Ctx, app.Ctx, "Stop")
+	stopCtx, logger := logs.Trace(app.Ctx, app.Ctx, "Stop")
 	logger.Info("应用关闭中...")
 
 	// 关闭 API 服务器
 	app.API.Stop()
 
 	// 关闭任务执行器
-	app.Domain.planService.Stop()
+	app.Domain.planService.Stop(stopCtx)
 
 	// 断开数据库连接
 	if err := app.Infra.storage.Disconnect(); err != nil {

internal/core/component_initializers.go

@@ -12,7 +12,6 @@ import (
 	"git.huangwc.com/pig/pig-farm-controller/internal/domain/pig"
 	"git.huangwc.com/pig/pig-farm-controller/internal/domain/plan"
 	"git.huangwc.com/pig/pig-farm-controller/internal/domain/task"
-	"git.huangwc.com/pig/pig-farm-controller/internal/domain/token"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/config"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/database"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
@@ -21,16 +20,17 @@ import (
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/transport"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/transport/lora"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/utils/token"
 	"gorm.io/gorm"
 )
 
 // Infrastructure 聚合了所有基础设施层的组件。
 type Infrastructure struct {
-	storage       database.Storage
-	repos         *Repositories
-	lora          *LoraComponents
-	notifyService domain_notify.Service
-	tokenService  token.Service
+	storage        database.Storage
+	repos          *Repositories
+	lora           *LoraComponents
+	notifyService  domain_notify.Service
+	tokenGenerator token.Generator
 }
 
 // initInfrastructure 初始化所有基础设施层组件。
@@ -52,14 +52,14 @@ func initInfrastructure(ctx context.Context, cfg *config.Config) (*Infrastructur
 		return nil, fmt.Errorf("初始化通知服务失败: %w", err)
 	}
 
-	tokenService := token.NewTokenService([]byte(cfg.App.JWTSecret))
+	tokenGenerator := token.NewTokenGenerator([]byte(cfg.App.JWTSecret))
 
 	return &Infrastructure{
-		storage:       storage,
-		repos:         repos,
-		lora:          lora,
-		notifyService: notifyService,
-		tokenService:  tokenService,
+		storage:        storage,
+		repos:          repos,
+		lora:           lora,
+		notifyService:  notifyService,
+		tokenGenerator: tokenGenerator,
 	}, nil
 }
 
@@ -139,8 +139,14 @@ func initDomainServices(ctx context.Context, cfg *config.Config, infra *Infrastr
 	pigPenTransferManager := pig.NewPigPenTransferManager(logs.AddCompName(baseCtx, "PigPenTransferManager"), infra.repos.pigPenRepo, infra.repos.pigTransferLogRepo, infra.repos.pigBatchRepo)
 	pigTradeManager := pig.NewPigTradeManager(logs.AddCompName(baseCtx, "PigTradeManager"), infra.repos.pigTradeRepo)
 	pigSickManager := pig.NewSickPigManager(logs.AddCompName(baseCtx, "PigSickManager"), infra.repos.pigSickPigLogRepo, infra.repos.medicationLogRepo)
-	pigBatchDomain := pig.NewPigBatchService(logs.AddCompName(baseCtx, "PigBatchDomain")), infra.repos.pigBatchRepo, infra.repos.pigBatchLogRepo, infra.repos.unitOfWork,
-		pigPenTransferManager, pigTradeManager, pigSickManager)
+	pigBatchDomain := pig.NewPigBatchService(
+		logs.AddCompName(baseCtx, "PigBatchDomain"),
+		infra.repos.pigBatchRepo,
+		infra.repos.pigBatchLogRepo,
+		infra.repos.unitOfWork,
+		pigPenTransferManager,
+		pigTradeManager, pigSickManager,
+	)
 
 	// 通用设备服务
 	generalDeviceService := device.NewGeneralDeviceService(
@@ -238,7 +244,7 @@ func initAppServices(ctx context.Context, infra *Infrastructure, domainServices
 	)
 	auditService := service.NewAuditService(logs.AddCompName(baseCtx, "AuditService"), infra.repos.userActionLogRepo)
 	planService := service.NewPlanService(logs.AddCompName(baseCtx, "AppPlanService"), domainServices.planService)
-	userService := service.NewUserService(logs.AddCompName(baseCtx, "UserService"), infra.repos.userRepo, infra.tokenService, infra.notifyService)
+	userService := service.NewUserService(logs.AddCompName(baseCtx, "UserService"), infra.repos.userRepo, infra.tokenGenerator, infra.notifyService)
 
 	return &AppServices{
 		pigFarmService:  pigFarmService,