重构ci

Makefile

@@ -31,11 +31,11 @@ e2e:
 
 .PHONY: e2e_up
 e2e_up:
-	docker compose -f .script/integration_test_compose.yml up -d
+	docker compose -p webook -f .script/integration_test_compose.yml up -d
 
 .PHONY: e2e_down
 e2e_down:
-	docker compose -f .script/integration_test_compose.yml down -v
+	docker compose -p webook -f .script/integration_test_compose.yml down -v
 
 .PHONY: mock
 mock:

config/config.yaml

@@ -3,14 +3,15 @@ wechat:
   appSecretKey: abc
 
 mysql:
-  dsn: "root:root@tcp(localhost:13316)/mysql"
+  dsn: "root:root@tcp(mysql8:13316)/mysql"
 
 redis:
-  addr: "localhost:6379"
+  addr: "redis:6379"
 
 web:
   port: 8080
   mode: debug
 
 session:
-  sessionEncryptedKey: "abcd"
+  sessionEncryptedKey: "abcd"
+

internal/test/ioc/db.go

@@ -1,11 +1,7 @@
 package testioc
 
 import (
-	"context"
-	"database/sql"
-	"time"
-
-	"github.com/ecodeclub/ekit/retry"
+	"github.com/ecodeclub/webook/ioc"
 	"github.com/ego-component/egorm"
 	"github.com/gotomicro/ego/core/econf"
 )
@@ -17,35 +13,7 @@ func InitDB() *egorm.Component {
 		return db
 	}
 	econf.Set("mysql.user", map[string]string{"dsn": "root:root@tcp(localhost:13316)/webook"})
-	WaitForDBSetup()
+	ioc.WaitForDBSetup(econf.GetStringMapString("mysql.user")["dsn"])
 	db = egorm.Load("mysql.user").Build()
 	return db
 }
-
-func WaitForDBSetup() {
-	sqlDB, err := sql.Open("mysql", econf.GetStringMapString("mysql.user")["dsn"])
-	if err != nil {
-		panic(err)
-	}
-	const maxInterval = 10 * time.Second
-	const maxRetries = 10
-	strategy, err := retry.NewExponentialBackoffRetryStrategy(time.Second, maxInterval, maxRetries)
-	if err != nil {
-		panic(err)
-	}
-
-	const timeout = 5 * time.Second
-	for {
-		ctx, cancel := context.WithTimeout(context.Background(), timeout)
-		err = sqlDB.PingContext(ctx)
-		cancel()
-		if err == nil {
-			break
-		}
-		next, ok := strategy.Next()
-		if !ok {
-			panic("WaitForDBSetup 重试失败......")
-		}
-		time.Sleep(next)
-	}
-}

ioc/db.go

@@ -15,9 +15,44 @@
 package ioc
 
 import (
+	"context"
+	"database/sql"
+	"time"
+
+	"github.com/ecodeclub/ekit/retry"
 	"github.com/ego-component/egorm"
+	"github.com/gotomicro/ego/core/econf"
 )
 
 func InitDB() *egorm.Component {
+	WaitForDBSetup(econf.GetString("mysql.dsn"))
 	return egorm.Load("mysql").Build()
 }
+
+func WaitForDBSetup(dsn string) {
+	sqlDB, err := sql.Open("mysql", dsn)
+	if err != nil {
+		panic(err)
+	}
+	const maxInterval = 10 * time.Second
+	const maxRetries = 10
+	strategy, err := retry.NewExponentialBackoffRetryStrategy(time.Second, maxInterval, maxRetries)
+	if err != nil {
+		panic(err)
+	}
+
+	const timeout = 5 * time.Second
+	for {
+		ctx, cancel := context.WithTimeout(context.Background(), timeout)
+		err = sqlDB.PingContext(ctx)
+		cancel()
+		if err == nil {
+			break
+		}
+		next, ok := strategy.Next()
+		if !ok {
+			panic("WaitForDBSetup 重试失败......")
+		}
+		time.Sleep(next)
+	}
+}