优化结构

cmd/wire_gen.go

@@ -156,20 +156,25 @@ 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)
-	moduleRuntime := app.Runtime(routes, taskMethods, registry)
-	websocketServer, cleanup2, err := websocket.New(store)
+	mqReloadable, cleanup2, err := mq.New(store, logger)
 	if err != nil {
 		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)
+	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)
 	kratosApp := newApp(logger, httpServer, taskScheduler, auditRecorder, reloadableLogger, mqReloadable)
 	return kratosApp, func() {
 		cleanup3()