change options

providers/captcha/captcha.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/mojocn/base64Captcha"
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 	"github.com/spf13/viper"
 )
 
@@ -22,7 +22,8 @@ type Captcha struct {
 	captcha *base64Captcha.Captcha
 }
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var conf Config
 	if err := o.UnmarshalConfig(&conf); err != nil {
 		log.Fatal(err)

providers/database/mysql/mysql.go

@@ -4,15 +4,16 @@ import (
 	"database/sql"
 
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
 	"github.com/rogeecn/atom/providers/log"
+	"github.com/rogeecn/atom/utils/opt"
 
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var conf Config
 	if err := o.UnmarshalConfig(&conf); err != nil {
 		return err

providers/database/postgres/postgres.go

@@ -4,14 +4,15 @@ import (
 	"log"
 
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"gorm.io/gorm/schema"
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var conf Config
 	if err := o.UnmarshalConfig(&conf); err != nil {
 		return err

providers/database/sqlite/sqlite.go

@@ -2,14 +2,15 @@ package sqlite
 
 import (
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 
 	// "gorm.io/driver/sqlite"
 	"github.com/glebarez/sqlite"
 	"gorm.io/gorm"
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var conf Config
 	if err := o.UnmarshalConfig(&conf); err != nil {
 		return err

providers/faker/faker.go

@@ -4,12 +4,13 @@ import (
 	"time"
 
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 
 	"github.com/brianvoe/gofakeit/v6"
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	return container.Container.Provide(func() (*gofakeit.Faker, error) {
 		faker := gofakeit.New(time.Now().UnixNano())
 		gofakeit.SetGlobalFaker(faker)

providers/http/gin/engine.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
 	"github.com/rogeecn/atom/providers/http"
 	"github.com/rogeecn/atom/providers/log"
+	"github.com/rogeecn/atom/utils/opt"
 
 	"github.com/gin-gonic/gin"
 )
@@ -32,7 +32,8 @@ func (e *Service) Serve() error {
 	return e.Engine.Run(e.conf.PortString())
 }
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var config http.Config
 	if err := o.UnmarshalConfig(&config); err != nil {
 		log.Fatal(err)

providers/jwt/jwt.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
 	"github.com/rogeecn/atom/providers/log"
+	"github.com/rogeecn/atom/utils/opt"
 
 	jwt "github.com/golang-jwt/jwt/v4"
 	"golang.org/x/sync/singleflight"
@@ -44,7 +44,8 @@ var (
 	TokenInvalid     = errors.New("Couldn't handle this token:")
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var config Config
 	if err := o.UnmarshalConfig(&config); err != nil {
 		log.Fatal(err)

providers/log/logger.go

@@ -2,12 +2,13 @@ package log
 
 import (
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 
 	"go.uber.org/zap"
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	var config Config
 	if err := o.UnmarshalConfig(&config); err != nil {
 		return err

providers/single_flight/flight.go

@@ -2,11 +2,12 @@ package single_flight
 
 import (
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 	"golang.org/x/sync/singleflight"
 )
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	return container.Container.Provide(func() (*singleflight.Group, error) {
 		return &singleflight.Group{}, nil
 	}, o.DiOptions()...)

providers/uuid/uuid.go

@@ -2,7 +2,7 @@ package uuid
 
 import (
 	"github.com/rogeecn/atom/container"
-	"github.com/rogeecn/atom/providers"
+	"github.com/rogeecn/atom/utils/opt"
 
 	"github.com/gofrs/uuid"
 )
@@ -11,7 +11,8 @@ type Generator struct {
 	generator uuid.Generator
 }
 
-func Provide(o *providers.Options) error {
+func Provide(opts ...opt.Option) error {
+	o := opt.New(opts...)
 	return container.Container.Provide(func() (*Generator, error) {
 		return &Generator{
 			generator: uuid.DefaultGenerator,

utils/opt/options.go

@@ -1,4 +1,4 @@
-package providers
+package opt
 
 import (
 	"github.com/spf13/viper"
@@ -7,7 +7,7 @@ import (
 
 type Options struct {
 	Config *viper.Viper
-	ConfigPrefix string
+	Prefix string
 	Name   string
 	Group  string
 }
@@ -23,7 +23,7 @@ func New(opts ...Option) *Options {
 }
 
 func (o *Options) UnmarshalConfig(config interface{}) error {
-	return o.Config.UnmarshalKey(o.ConfigPrefix, &config)
+	return o.Config.UnmarshalKey(o.Prefix, &config)
 }
 
 func (o *Options) DiOptions() []dig.ProvideOption {
@@ -37,26 +37,26 @@ func (o *Options) DiOptions() []dig.ProvideOption {
 	return options
 }
 
-func WithConfig(config *viper.Viper) Option {
+func Config(config *viper.Viper) Option {
 	return func(o *Options) {
 		o.Config = config
 	}
 }
 
-func WithName(name string) Option {
+func Name(name string) Option {
 	return func(o *Options) {
 		o.Name = name
 	}
 }
 
-func WithGroup(group string) Option {
+func Group(group string) Option {
 	return func(o *Options) {
 		o.Group = group
 	}
 }
 
-func WithConfigPrefix(prefix string) Option {
+func Prefix(prefix string) Option {
 	return func(o *Options) {
-		o.ConfigPrefix = prefix
+		o.Prefix = prefix
 	}
 }