优化结构

cmd/wire.go

@@ -17,6 +17,7 @@ import (
 	"kra/internal/integration/cache"
 	"kra/internal/server"
 	"kra/internal/server/handler"
+	"kra/internal/server/middleware"
 	"kra/internal/server/router"
 	"kra/internal/service"
 	"kra/internal/worker"
@@ -42,6 +43,7 @@ func wireApp(*conf.Server, *conf.Runtime, *slog.Logger, *logging.ReloadableLogge
 		initialize.ProviderSet,
 		wire.Bind(new(initialize.Backend), new(*data.Data)),
 		wire.Bind(new(cache.RedisProvider), new(*data.Data)),
+		wire.Bind(new(middleware.TokenAuthenticator), new(*service.AuthService)),
 		wire.Bind(new(biz.TaskMethodRegistry), new(*platformtask.Registry)),
 		biz.ProviderSet,
 		service.ProviderSet,

cmd/wire_gen.go

@@ -156,25 +156,20 @@ func wireApp(confServer *conf.Server, runtime *conf.Runtime, logger *slog.Logger
 	v := handler.NewSet(authority, menu, api, permission, organization, announcement, handlerEmail, handlerPayment, task, media, audit, export, version, dictionary, parameter, apiToken, systemConfig, public, user, navigation, session, integrationConfig)
 	routes := router.NewRoutes(v)
 	taskMethods := worker.NewTaskMethods(taskUsecase, mediaUsecase, runtime)
-	mqReloadable, cleanup2, err := mq.New(store, logger)
+	moduleRuntime := app.Runtime(routes, taskMethods, registry)
+	websocketServer, cleanup2, err := websocket.New(store)
 	if err != nil {
 		cleanup()
 		return nil, nil, err
 	}
-	moduleRuntime, err := app.Runtime(routes, taskMethods, registry, catalog, mqReloadable)
-	if err != nil {
-		cleanup2()
-		cleanup()
-		return nil, nil, err
-	}
-	websocketServer, cleanup3, err := websocket.New(store)
-	if err != nil {
-		cleanup2()
-		cleanup()
-		return nil, nil, err
-	}
 	engine := server.NewGinEngineWithRuntime(runtime, accessControlService, authService, securityService, auditRecorder, logger, string2, moduleRuntime, websocketServer)
 	httpServer := server.NewGinServer(confServer, engine)
+	mqReloadable, cleanup3, err := mq.New(store, logger)
+	if err != nil {
+		cleanup2()
+		cleanup()
+		return nil, nil, err
+	}
 	kratosApp := newApp(logger, httpServer, taskScheduler, auditRecorder, reloadableLogger, mqReloadable)
 	return kratosApp, func() {
 		cleanup3()