update

application/init_app.go

@@ -26,6 +26,33 @@ import (
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 )
 
+func init() {
+	eventbus.Eb.Subscribe(eventbus.TopicParseConf, func(ctx context.Context) {
+		parseInit()
+	})
+	eventbus.Eb.Subscribe(eventbus.TopicLoggerInit, func(ctx context.Context) {
+		if err := initLogger(config.Cfg); err != nil {
+			panic(err)
+		}
+	})
+	eventbus.Eb.Subscribe(eventbus.TopicDBInit, func(ctx context.Context) {
+		initDatabase()
+	})
+	eventbus.Eb.Subscribe(eventbus.TopicCacheInit, func(ctx context.Context) {
+		conf := config.Cfg
+		database.InitCache(conf.App.CacheType)
+	})
+	eventbus.Eb.Subscribe(eventbus.TopicMiddlewareInit, func(ctx context.Context) {
+		conf := config.Cfg
+		initTrace(conf)
+		initState(conf)
+	})
+	eventbus.Eb.Subscribe(eventbus.TopicRdInit, func(ctx context.Context) {
+		conf := config.Cfg
+		initRd(conf)
+	})
+}
+
 func parseInit() {
 	if confType, ok := os.LookupEnv("CONF_TYPE"); (ok && sliceUtils.NotContains([]string{"local", "nacos", "consul"}, confType)) || !ok {
 		return
@@ -41,10 +68,6 @@ func parseInit() {
 	if err := dxsf.Init(); err != nil {
 		logger.Fatal(err.Error())
 	}
-	logger.Info("[dxsf] initialized.")
-	if err := initOthers(); err != nil {
-		logger.Fatal(err.Error())
-	}
 }
 
 type Application struct {
@@ -54,11 +77,28 @@ type Application struct {
 
 func (x *Application) Run() {
 	defer goutils.Recover()
-	parseInit()
+
+	ctx := context.TODO()
+	eventbus.Eb.Publish(ctx, eventbus.TopicParseConf)
+	eventbus.Eb.Publish(ctx, eventbus.TopicParseConfFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicLoggerInit)
+	eventbus.Eb.Publish(ctx, eventbus.TopicLoggerInitFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicDBInit)
+	eventbus.Eb.Publish(ctx, eventbus.TopicDBInitFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicCacheInit)
+	eventbus.Eb.Publish(ctx, eventbus.TopicCacheInitFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicMiddlewareInit)
+	eventbus.Eb.Publish(ctx, eventbus.TopicMiddlewareInitFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicCronInit)
+	eventbus.Eb.Publish(ctx, eventbus.TopicCronInitFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicRdInit)
+	eventbus.Eb.Publish(ctx, eventbus.TopicRdInitFinish)
+	eventbus.Eb.Publish(ctx, eventbus.TopicGinEngineCreated)
+	eventbus.Eb.Publish(ctx, eventbus.TopicPrintSwagger)
+
 	services := CreateServices(x.h())
 	closes := Close(services)
 	x.app = app.New(services, closes)
-	eventbus.Eb.Publish(context.TODO(), eventbus.TopicPrintSwagger)
 	x.app.Run()
 }
 
@@ -103,25 +143,10 @@ func initRd(conf *config.Config) error {
 	return nil
 }
 
-// init logger,trace,stat,database,cache,rd...
-func initOthers() (err error) {
-	ctx := context.TODO()
-	conf := config.Cfg
-	if err := initLogger(conf); err != nil {
-		return err
-	}
-	initTrace(conf)
-	initState(conf)
+func initDatabase() (err error) {
 	if err := database.InitDB(); err != nil {
 		return err
 	}
-	eventbus.Eb.Publish(ctx, eventbus.TopicDBInitFinish)
-	database.InitCache(conf.App.CacheType)
-	eventbus.Eb.Publish(ctx, eventbus.TopicCacheInitFinish)
-	if err := initRd(conf); err != nil {
-		return err
-	}
-	eventbus.Eb.Publish(ctx, eventbus.TopicCoreInitFinish)
 	return nil
 }
 

config/init.go

@@ -2,13 +2,11 @@ package config
 
 import (
 	"bytes"
-	"context"
 	"os"
 	"strings"
 
 	"github.com/spf13/cast"
 	"github.com/spf13/viper"
-	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/eventbus"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 )
 
@@ -65,7 +63,6 @@ func ParseConf() (err error) {
 			return err
 		}
 	}
-	eventbus.Eb.Publish(context.TODO(), eventbus.TopicParseConfFinish)
 	return nil
 }
 

pkg/eventbus/init.go

@@ -3,13 +3,21 @@ package eventbus
 var Eb = New()
 
 const (
-	TopicParseConfStart   string = "event:application:conf:init:start"           // 配置文件解析开始
-	TopicParseConfFinish  string = "event:application:conf:init:finish"          // 配置文件解析完毕
-	TopicDBInitFinish     string = "event:application:database:init:finish"      // 数据库连接初始化完成
-	TopicCacheInitFinish  string = "event:application:cache:init:finish"         // cache初始化完成
-	TopicCronInitFinish   string = "event:application:cron:init:finish"          // 定时任务初始化完成
-	TopicCoreInitFinish   string = "event:application:core:init:finish"          // 核心服务初始化完成
-	TopicGinEngineCreated string = "event:application:gin:engine:created:finish" // gin engine 创建完毕
-	TopicPrintSwagger     string = "event:swagger:print"                         // 打印swagger doc info
-	TopicApplicationClose string = "event:application:close"                     // 应用关闭
+	TopicParseConf            string = "event:application:conf:init"              //
+	TopicParseConfFinish      string = "event:application:conf:init:finish"       //
+	TopicLoggerInit           string = "event:application:logger:init"            //
+	TopicLoggerInitFinish     string = "event:application:logger:init:finish"     //
+	TopicDBInit               string = "event:application:database:init"          //
+	TopicDBInitFinish         string = "event:application:database:init:finish"   //
+	TopicCacheInit            string = "event:application:cache:init"             //
+	TopicCacheInitFinish      string = "event:application:cache:init:finish"      //
+	TopicMiddlewareInit       string = "event:application:middleware:init"        //
+	TopicMiddlewareInitFinish string = "event:application:middleware:init:finish" //
+	TopicCronInit             string = "event:application:cron:init"              //
+	TopicCronInitFinish       string = "event:application:cron:init:finish"       //
+	TopicRdInit               string = "event:application:rd:init"                //
+	TopicRdInitFinish         string = "event:application:rd:init:finish"         //
+	TopicGinEngineCreated     string = "event:application:gin:engine:created"     //
+	TopicPrintSwagger         string = "event:swagger:print"                      //
+	TopicApplicationClose     string = "event:application:close"                  //
 )