Browse Source

refactor(initutils): 重构异步初始化工具并更新配置加载- 移除 async_init.go 文件,替换为 global_wait_group.go- 更新 go.mod 文件,将 Go 版本升级到 1.25
- 在 config/load.go 中添加配置值的打印输出

dcsunny 1 month ago
parent
commit
d4a2802876
4 changed files with 14 additions and 27 deletions
  1. 1 1
      config/load.go
  2. 1 1
      go.mod
  3. 0 25
      initutils/async_init.go
  4. 12 0
      initutils/global_wait_group.go

+ 1 - 1
config/load.go

@@ -42,7 +42,7 @@ func Load(sources []Source, bc any) error {
 	c := config.New(
 		config.WithSource(configSources...),
 		config.WithDecoder(func(kv *config.KeyValue, v map[string]interface{}) error {
-
+			fmt.Println(string(kv.Value))
 			ok := sourceMap.Has(kv.Key)
 			if !ok {
 				return errors.New("unknown config key")

+ 1 - 1
go.mod

@@ -1,6 +1,6 @@
 module git.ikuban.com/server/kratos-utils/v2
 
-go 1.23.2
+go 1.25
 
 require (
 	dario.cat/mergo v1.0.0

+ 0 - 25
initutils/async_init.go

@@ -1,25 +0,0 @@
-package initutils
-
-import (
-	"sync"
-)
-
-var asyncInitWaitGroup sync.WaitGroup
-
-func AsyncInitAdd()  { asyncInitWaitGroup.Add(1) }
-func AsyncInitDone() { asyncInitWaitGroup.Done() }
-func AsyncInitWait() { asyncInitWaitGroup.Wait() }
-
-// defer initutils.AsyncInitAddDone()()
-func AsyncInitAddDone() func() {
-	asyncInitWaitGroup.Add(1)
-	return func() {
-		asyncInitWaitGroup.Done()
-	}
-}
-
-func AsyncInit(f func()) {
-	asyncInitWaitGroup.Add(1)
-	defer asyncInitWaitGroup.Done()
-	f()
-}

+ 12 - 0
initutils/global_wait_group.go

@@ -0,0 +1,12 @@
+package initutils
+
+import (
+	"sync"
+)
+
+var globalWaitGroup sync.WaitGroup
+
+func GlobalWaitGroupWait() { globalWaitGroup.Wait() }
+func GlobalWaitGroupWaitGo(f func()) {
+	globalWaitGroup.Go(f)
+}