From 6205789df225e6fa1fc8974c47416d8f8dd4cc1f Mon Sep 17 00:00:00 2001 From: shenghui Date: Thu, 15 Aug 2019 14:16:35 +0800 Subject: [PATCH] update --- README.md | 8 ++++---- db.go | 6 +++--- doc.go | 8 ++++---- http.go | 6 +++--- logger.go | 6 +++--- mailer.go | 6 +++--- mongo.go | 6 +++--- redis.go | 6 +++--- zipkin.go | 12 ++++++------ 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index e1edafa..0390da0 100755 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ go get github.com/iiinsomnia/yiigo/v3 ```go // default db -yiigo.RegisterDB("default", yiigo.MySQL, "root:root@tcp(localhost:3306)/test") +yiigo.RegisterDB(yiigo.AsDefault, yiigo.MySQL, "root:root@tcp(localhost:3306)/test") yiigo.DB.Get(&User{}, "SELECT * FROM `user` WHERE `id` = ?", 1) @@ -48,7 +48,7 @@ yiigo.UseDB("foo").Get(&User{}, "SELECT * FROM `user` WHERE `id` = ?", 1) ```go // default mongodb -yiigo.RegisterMongoDB("default", "mongodb://localhost:27017") +yiigo.RegisterMongoDB(yiigo.AsDefault, "mongodb://localhost:27017") ctx, _ := context.WithTimeout(context.Background(), 5*time.Second) yiigo.Mongo.Database("test").Collection("numbers").InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}) @@ -64,7 +64,7 @@ yiigo.UseMongo("foo").Database("test").Collection("numbers").InsertOne(ctx, bson ```go // default redis -yiigo.RegisterRedis("default", "localhost:6379") +yiigo.RegisterRedis(yiigo.AsDefault, "localhost:6379") conn, err := yiigo.Redis.Get() @@ -143,7 +143,7 @@ fmt.Println(string(b)) ```go // default logger -yiigo.RegisterLogger("default", "app.log") +yiigo.RegisterLogger(yiigo.AsDefault, "app.log") yiigo.Logger.Info("hello world") // other logger diff --git a/db.go b/db.go index 0f49d72..cbb30d4 100644 --- a/db.go +++ b/db.go @@ -30,19 +30,19 @@ type dbOptions struct { // DBOption configures how we set up the db type DBOption interface { - apply(options *dbOptions) + apply(*dbOptions) } // funcDBOption implements db option type funcDBOption struct { - f func(options *dbOptions) + f func(*dbOptions) } func (fo *funcDBOption) apply(o *dbOptions) { fo.f(o) } -func newFuncDBOption(f func(o *dbOptions)) *funcDBOption { +func newFuncDBOption(f func(*dbOptions)) *funcDBOption { return &funcDBOption{f: f} } diff --git a/doc.go b/doc.go index 04ebe7e..d42d602 100644 --- a/doc.go +++ b/doc.go @@ -5,7 +5,7 @@ // MySQL // // // default db -// yiigo.RegisterDB("default", yiigo.MySQL, "root:root@tcp(localhost:3306)/test") +// yiigo.RegisterDB(yiigo.AsDefault, yiigo.MySQL, "root:root@tcp(localhost:3306)/test") // // yiigo.DB.Get(&User{}, "SELECT * FROM `user` WHERE `id` = ?", 1) // @@ -17,7 +17,7 @@ // MongoDB // // // default mongodb -// yiigo.RegisterMongoDB("default", "mongodb://localhost:27017") +// yiigo.RegisterMongoDB(yiigo.AsDefault, "mongodb://localhost:27017") // // ctx, _ := context.WithTimeout(context.Background(), 5*time.Second) // yiigo.Mongo.Database("test").Collection("numbers").InsertOne(ctx, bson.M{"name": "pi", "value": 3.14159}) @@ -31,7 +31,7 @@ // Redis // // // default redis -// yiigo.RegisterRedis("default", "localhost:6379") +// yiigo.RegisterRedis(yiigo.AsDefault, "localhost:6379") // // conn, err := yiigo.Redis.Get() // @@ -105,7 +105,7 @@ // Logger // // // default logger -// yiigo.RegisterLogger("default", "app.log") +// yiigo.RegisterLogger(yiigo.AsDefault, "app.log") // yiigo.Logger.Info("hello world") // // // other logger diff --git a/http.go b/http.go index ea6de82..4b495cf 100644 --- a/http.go +++ b/http.go @@ -32,19 +32,19 @@ type httpClientOptions struct { // HTTPClientOption configures how we set up the http client type HTTPClientOption interface { - apply(options *httpClientOptions) + apply(*httpClientOptions) } // funcHTTPClientOption implements http client option type funcHTTPClientOption struct { - f func(options *httpClientOptions) + f func(*httpClientOptions) } func (fo *funcHTTPClientOption) apply(o *httpClientOptions) { fo.f(o) } -func newFuncHTTPOption(f func(o *httpClientOptions)) *funcHTTPClientOption { +func newFuncHTTPOption(f func(*httpClientOptions)) *funcHTTPClientOption { return &funcHTTPClientOption{f: f} } diff --git a/logger.go b/logger.go index 6f09ef0..23e6066 100644 --- a/logger.go +++ b/logger.go @@ -26,19 +26,19 @@ type logOptions struct { // LogOption configures how we set up the logger type LogOption interface { - apply(options *logOptions) + apply(*logOptions) } // funcLogOption implements db option type funcLogOption struct { - f func(options *logOptions) + f func(*logOptions) } func (fo *funcLogOption) apply(o *logOptions) { fo.f(o) } -func newFuncLogOption(f func(o *logOptions)) *funcLogOption { +func newFuncLogOption(f func(*logOptions)) *funcLogOption { return &funcLogOption{f: f} } diff --git a/mailer.go b/mailer.go index 4ac76b5..3921029 100644 --- a/mailer.go +++ b/mailer.go @@ -27,19 +27,19 @@ type emailOptions struct { // EMailOption configures how we set up the email type EMailOption interface { - apply(options *emailOptions) + apply(*emailOptions) } // funcEMailOption implements email option type funcEMailOption struct { - f func(options *emailOptions) + f func(*emailOptions) } func (fo *funcEMailOption) apply(o *emailOptions) { fo.f(o) } -func newFuncEMailOption(f func(o *emailOptions)) *funcEMailOption { +func newFuncEMailOption(f func(*emailOptions)) *funcEMailOption { return &funcEMailOption{f: f} } diff --git a/mongo.go b/mongo.go index 5bdaba3..2b68ce8 100644 --- a/mongo.go +++ b/mongo.go @@ -59,19 +59,19 @@ type mongoOptions struct { // MongoOption configures how we set up the mongo type MongoOption interface { - apply(options *mongoOptions) + apply(*mongoOptions) } // funcMongoOption implements mongo option type funcMongoOption struct { - f func(options *mongoOptions) + f func(*mongoOptions) } func (fo *funcMongoOption) apply(o *mongoOptions) { fo.f(o) } -func newFuncMongoOption(f func(o *mongoOptions)) *funcMongoOption { +func newFuncMongoOption(f func(*mongoOptions)) *funcMongoOption { return &funcMongoOption{f: f} } diff --git a/redis.go b/redis.go index a5b5827..757e171 100644 --- a/redis.go +++ b/redis.go @@ -25,19 +25,19 @@ type redisOptions struct { // RedisOption configures how we set up the db type RedisOption interface { - apply(options *redisOptions) + apply(*redisOptions) } // funcRedisOption implements redis option type funcRedisOption struct { - f func(options *redisOptions) + f func(*redisOptions) } func (fo *funcRedisOption) apply(o *redisOptions) { fo.f(o) } -func newFuncRedisOption(f func(o *redisOptions)) *funcRedisOption { +func newFuncRedisOption(f func(*redisOptions)) *funcRedisOption { return &funcRedisOption{f: f} } diff --git a/zipkin.go b/zipkin.go index ddea0fa..18e5783 100644 --- a/zipkin.go +++ b/zipkin.go @@ -43,19 +43,19 @@ type zipkinTracerOptions struct { // ZipkinTracerOption configures how we set up the zipkin tracer type ZipkinTracerOption interface { - apply(options *zipkinTracerOptions) error + apply(*zipkinTracerOptions) error } // funcZipkinTracerOption implements zipkin tracer option type funcZipkinTracerOption struct { - f func(options *zipkinTracerOptions) error + f func(*zipkinTracerOptions) error } func (fo *funcZipkinTracerOption) apply(o *zipkinTracerOptions) error { return fo.f(o) } -func newFuncZipkinTracerOption(f func(o *zipkinTracerOptions) error) *funcZipkinTracerOption { +func newFuncZipkinTracerOption(f func(*zipkinTracerOptions) error) *funcZipkinTracerOption { return &funcZipkinTracerOption{f: f} } @@ -340,19 +340,19 @@ type zipkinClientOptions struct { // ZipkinClientOption configures how we set up the zipkin client type ZipkinClientOption interface { - apply(options *zipkinClientOptions) + apply(*zipkinClientOptions) } // funcZipkinClientOption implements zipkin client option type funcZipkinClientOption struct { - f func(options *zipkinClientOptions) + f func(*zipkinClientOptions) } func (fo *funcZipkinClientOption) apply(o *zipkinClientOptions) { fo.f(o) } -func newFuncZipkinClientOption(f func(o *zipkinClientOptions)) *funcZipkinClientOption { +func newFuncZipkinClientOption(f func(*zipkinClientOptions)) *funcZipkinClientOption { return &funcZipkinClientOption{f: f} }