feat: add redis driver for mq

tuihub · Mar 2, 2024 · 02dc32b · 02dc32b
1 parent 92b5aef
commit 02dc32b
Show file tree

Hide file tree

Showing 43 changed files with 586 additions and 598 deletions.
diff --git a/app/sephirah/cmd/sephirah/main.go b/app/sephirah/cmd/sephirah/main.go
@@ -58,7 +58,8 @@ func main() {
 
 	app, cleanup, err := wireApp(
 		bc.GetServer(),
-		bc.GetData(),
+		bc.GetDatabase(),
+		bc.GetS3(),
 		bc.GetPorter(),
 		bc.GetAuth(),
 		bc.GetMq(),

diff --git a/app/sephirah/cmd/sephirah/wire.go b/app/sephirah/cmd/sephirah/wire.go
@@ -26,7 +26,8 @@ import (
 // wireApp init kratos application.
 func wireApp(
 	*conf.SephirahServer,
-	*conf.SephirahData,
+	*conf.Database,
+	*conf.S3,
 	*conf.Porter,
 	*conf.Auth,
 	*conf.MQ,

diff --git a/app/sephirah/cmd/sephirah/wire_gen.go b/app/sephirah/cmd/sephirah/wire_gen.go
diff --git a/app/sephirah/internal/data/binah.go b/app/sephirah/internal/data/binah.go
@@ -19,13 +19,13 @@ type binahRepo struct {
 	buckets map[bizbinah.Bucket]string
 }
 
-func NewBinahRepo(c *conf.SephirahData) (bizbinah.BinahRepo, error) {
-	if c == nil || c.GetS3() == nil {
+func NewBinahRepo(c *conf.S3) (bizbinah.BinahRepo, error) {
+	if c == nil {
 		return new(binahRepo), nil
 	}
-	minioClient, err := minio.New(c.GetS3().GetEndPoint(), &minio.Options{ //nolint:exhaustruct //TODO
-		Creds:  credentials.NewStaticV4(c.GetS3().GetAccessKey(), c.GetS3().GetSecretKey(), ""),
-		Secure: c.GetS3().GetUseSsl(),
+	minioClient, err := minio.New(c.GetEndPoint(), &minio.Options{ //nolint:exhaustruct //TODO
+		Creds:  credentials.NewStaticV4(c.GetAccessKey(), c.GetSecretKey(), ""),
+		Secure: c.GetUseSsl(),
 	})
 	if err != nil {
 		return nil, err

diff --git a/app/sephirah/internal/data/data.go b/app/sephirah/internal/data/data.go
@@ -51,12 +51,12 @@ func NewData(db *ent.Client) *Data {
 	}
 }
 
-func NewSQLClient(c *conf.SephirahData, app *libapp.Settings) (*ent.Client, func(), error) {
+func NewSQLClient(c *conf.Database, app *libapp.Settings) (*ent.Client, func(), error) {
 	var driverName, dataSourceName string
 	if c == nil {
-		c = new(conf.SephirahData)
+		c = new(conf.Database)
 	}
-	driverName = c.GetDatabase().GetDriver()
+	driverName = c.GetDriver()
 	if driverName == "" {
 		logger.Warnf("database driver is empty, using memory mode.")
 		driverName = driverMemory
@@ -68,13 +68,13 @@ func NewSQLClient(c *conf.SephirahData, app *libapp.Settings) (*ent.Client, func
 		dataSourceName = fmt.Sprintf("file:%s?cache=shared&_fk=1", path.Join(app.DataPath, "librarian.db"))
 	case driverPostgres:
 		dataSourceName = fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s",
-			c.GetDatabase().GetHost(),
-			c.GetDatabase().GetPort(),
-			c.GetDatabase().GetUser(),
-			c.GetDatabase().GetDbname(),
-			c.GetDatabase().GetPassword(),
+			c.GetHost(),
+			c.GetPort(),
+			c.GetUser(),
+			c.GetDbname(),
+			c.GetPassword(),
 		)
-		if c.GetDatabase().GetNoSsl() {
+		if c.GetNoSsl() {
 			dataSourceName += " sslmode=disable"
 		}
 	default:

diff --git a/app/sephirah/internal/data/internal/ent/account.go b/app/sephirah/internal/data/internal/ent/account.go
diff --git a/app/sephirah/internal/data/internal/ent/app.go b/app/sephirah/internal/data/internal/ent/app.go
diff --git a/app/sephirah/internal/data/internal/ent/appbinary.go b/app/sephirah/internal/data/internal/ent/appbinary.go
diff --git a/app/sephirah/internal/data/internal/ent/appinfo.go b/app/sephirah/internal/data/internal/ent/appinfo.go
diff --git a/app/sephirah/internal/data/internal/ent/appinst.go b/app/sephirah/internal/data/internal/ent/appinst.go
diff --git a/app/sephirah/internal/data/internal/ent/feed.go b/app/sephirah/internal/data/internal/ent/feed.go
diff --git a/app/sephirah/internal/data/internal/ent/feedconfig.go b/app/sephirah/internal/data/internal/ent/feedconfig.go
diff --git a/app/sephirah/internal/data/internal/ent/feeditem.go b/app/sephirah/internal/data/internal/ent/feeditem.go
diff --git a/app/sephirah/internal/data/internal/ent/file.go b/app/sephirah/internal/data/internal/ent/file.go
diff --git a/app/sephirah/internal/data/internal/ent/image.go b/app/sephirah/internal/data/internal/ent/image.go
diff --git a/app/sephirah/internal/data/internal/ent/notifyflow.go b/app/sephirah/internal/data/internal/ent/notifyflow.go
diff --git a/app/sephirah/internal/data/internal/ent/notifyflowsource.go b/app/sephirah/internal/data/internal/ent/notifyflowsource.go