diff --git a/.gitignore b/.gitignore index a9ea21f..1e4a5f3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ *.log goinit.sh gomod.sh -*_test.go \ No newline at end of file +*_test.go +/vendor/ diff --git a/client.go b/client.go index 242011b..e0e61f0 100644 --- a/client.go +++ b/client.go @@ -6,16 +6,15 @@ import ( "go.dtapp.net/goip" "go.dtapp.net/golog" "go.dtapp.net/gorequest" - "gorm.io/gorm" ) type ConfigClient struct { - StoreId int // 店铺ID - AppKey int // key - AppSecret string // secret - MongoDb *dorm.MongoClient // 日志数据库 - PgsqlDb *gorm.DB // 日志数据库 - DatabaseName string // 库名 + StoreId int // 店铺ID + AppKey int // key + AppSecret string // secret + GormClient *dorm.GormClient // 日志数据库 + LogClient *golog.GoLog // 日志驱动 + LogDebug bool // 日志开关 } type Client struct { client *gorequest.App // 请求客户端 @@ -31,21 +30,13 @@ func NewClient(config *ConfigClient) (*Client, error) { c.client = gorequest.NewHttp() - if c.config.PgsqlDb != nil { - c.log, err = golog.NewApiClient( - golog.WithGormClient(c.config.PgsqlDb), - golog.WithTableName(logTable), - ) - if err != nil { - return nil, err - } - } - if c.config.MongoDb != nil { - c.log, err = golog.NewApiClient( - golog.WithMongoClient(c.config.MongoDb), - golog.WithDatabaseName(c.config.DatabaseName), - golog.WithCollectionName(logTable), - ) + if c.config.GormClient.Db != nil { + c.log, err = golog.NewApiClient(&golog.ApiClientConfig{ + GormClient: c.config.GormClient, + TableName: logTable, + LogClient: c.config.LogClient, + LogDebug: c.config.LogDebug, + }) if err != nil { return nil, err } diff --git a/const.go b/const.go index 30e9ad1..030fdd7 100644 --- a/const.go +++ b/const.go @@ -12,4 +12,4 @@ const ( logTable = "wikeyun" ) -const Version = "1.0.10" +const Version = "1.0.11" diff --git a/go.mod b/go.mod index 4c52d10..c6b4869 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,9 @@ go 1.19 require ( go.dtapp.net/dorm v1.0.19 go.dtapp.net/goip v1.0.25 - go.dtapp.net/golog v1.0.26 + go.dtapp.net/golog v1.0.27 go.dtapp.net/gorequest v1.0.26 go.dtapp.net/gostring v1.0.6 - gorm.io/gorm v1.23.8 ) require ( @@ -84,6 +83,7 @@ require ( gorm.io/datatypes v1.0.7 // indirect gorm.io/driver/mysql v1.3.5 // indirect gorm.io/driver/postgres v1.3.8 // indirect + gorm.io/gorm v1.23.8 // indirect mellium.im/sasl v0.2.1 // indirect xorm.io/builder v0.3.12 // indirect xorm.io/xorm v1.3.1 // indirect diff --git a/go.sum b/go.sum index ea5aa9c..c821eca 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ go.dtapp.net/goip v1.0.25 h1:GSgQkR7dc28TX8E1mF3wAy+EEGZ++tgqc8Q85OKZPEY= go.dtapp.net/goip v1.0.25/go.mod h1:dKeNuWJttH4AvvYVHV0FagB6BVvFM1HGDKFxLKr+hkQ= go.dtapp.net/gojson v1.0.1 h1:MHeSGlq1KxzL7rCkm18fhwW4GNORHohdDMmxY5PupKY= go.dtapp.net/gojson v1.0.1/go.mod h1:TkkpTNxHBKxul0e7gC5MrL1K4ICFB9mQ7wHzjBah3/k= -go.dtapp.net/golog v1.0.26 h1:EmUA/QwtQcX57tyTL73H92zJeObJDuTcUqE01MI3v1A= -go.dtapp.net/golog v1.0.26/go.mod h1:Ey15AuwDiRyaTXieM3f4Ukzkbmm6+jVb/VYpW00p840= +go.dtapp.net/golog v1.0.27 h1:tcQpY1HOmpeNppjgVKeqEim7nsmXUCLcE3sDtvsYd+8= +go.dtapp.net/golog v1.0.27/go.mod h1:CJj6+tKM7Rdlgf+/clyCi949pcNoR8ZZIQ7vwhtrec8= go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs= go.dtapp.net/gorandom v1.0.1/go.mod h1:ZPdgalKpvFV/ATQqR0k4ns/F/IpITAZpx6WkWirr5Y8= go.dtapp.net/gorequest v1.0.26 h1:t+rMW7liLHz1RgY60ztWIghSkTeQePKWM0EsDG1IqMI= diff --git a/request.go b/request.go index 7a47fd0..06fe0af 100644 --- a/request.go +++ b/request.go @@ -31,12 +31,9 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte } // 日志 - if c.config.PgsqlDb != nil { + if c.config.GormClient.Db != nil { go c.log.GormMiddleware(ctx, request, Version) } - if c.config.MongoDb != nil { - go c.log.MongoMiddleware(ctx, request, Version) - } return request, err }