优化结构

cmd/wire_gen.go

@@ -8,7 +8,6 @@ package main
 
 import (
 	"github.com/go-kratos/kratos/v3"
-	"kra/internal/app"
 	integration3 "kra/internal/biz/integration"
 	payment2 "kra/internal/biz/payment"
 	system2 "kra/internal/biz/system"
@@ -75,6 +74,7 @@ func wireApp(configServer *config.Server, store *config.Store, logger *slog.Logg
 	v2 := system3.NewSecurityService(securityUsecase)
 	auditRecorderUsecase := system2.NewAuditRecorderUsecase(auditRecordRepo)
 	v3 := system3.NewAuditRecorder(auditRecorderUsecase)
+	registry := taskRegistry()
 	authorityUsecase := system2.NewAuthorityUsecase(authorityAccessRepo)
 	v4 := system3.NewAuthorityService(authorityUsecase)
 	authority := handler.NewAuthority(v4)
@@ -111,7 +111,6 @@ func wireApp(configServer *config.Server, store *config.Store, logger *slog.Logg
 	v12 := payment3.NewPaymentService(paymentUsecase)
 	handlerPayment := handler.NewPayment(v12)
 	taskRepo := task.NewTaskRepo(dataData)
-	registry := app.TaskRegistry(catalog)
 	taskUsecase := task2.NewTaskUsecaseWithRegistry(taskRepo, registry)
 	taskExecutor := worker.NewTaskExecutorWithRegistry(taskUsecase, registry)
 	taskScheduler := worker.NewTaskScheduler(taskUsecase, authorityUsecase, taskExecutor, logger)
@@ -192,14 +191,13 @@ func wireApp(configServer *config.Server, store *config.Store, logger *slog.Logg
 	maintenanceRepo := system.NewMaintenanceRepo(dataData)
 	maintenanceUsecase := system2.NewMaintenanceUsecase(maintenanceRepo)
 	taskMethods := worker.NewTaskMethods(taskUsecase, maintenanceUsecase, mediaUsecase, store)
-	composition := runtimeContributions(routes, taskMethods)
-	runtime := app.Build(composition, registry)
+	routeRegistrar := buildRuntime(registry, routes, taskMethods)
 	websocketServer, cleanup2, err := websocket.New(runtimeconfigStore)
 	if err != nil {
 		cleanup()
 		return nil, nil, err
 	}
-	engine := server.NewGinEngineWithRuntime(store, v, authService, v2, v3, logger, string2, runtime, websocketServer)
+	engine := server.NewGinEngineWithRuntime(store, v, authService, v2, v3, logger, string2, routeRegistrar, websocketServer)
 	httpServer := server.NewGinServer(configServer, engine)
 	mqReloadable, cleanup3, err := mq.New(runtimeconfigStore, logger)
 	if err != nil {
@@ -207,8 +205,8 @@ func wireApp(configServer *config.Server, store *config.Store, logger *slog.Logg
 		cleanup()
 		return nil, nil, err
 	}
-	kratosApp := newApp(logger, httpServer, taskScheduler, v3, reloadableLogger, mqReloadable)
-	return kratosApp, func() {
+	app := newApp(logger, httpServer, taskScheduler, v3, reloadableLogger, mqReloadable)
+	return app, func() {
 		cleanup3()
 		cleanup2()
 		cleanup()