- update log

.gitignore

@@ -7,3 +7,4 @@
 goinit.sh
 gomod.sh
 *_test.go
+/vendor/

client.go

@@ -4,7 +4,6 @@ import (
 	"go.dtapp.net/dorm"
 	"go.dtapp.net/golog"
 	"go.dtapp.net/gorequest"
-	"gorm.io/gorm"
 )
 
 type ConfigClient struct {
@@ -18,17 +17,16 @@ type ConfigClient struct {
 	ComponentAppSecret     string // 第三方平台 app_secret
 	MessageToken           string
 	MessageKey             string
-	RedisClient            *dorm.RedisClient // 缓存数据库
-	MongoDb                *dorm.MongoClient // 日志数据库
-	PgsqlDb                *gorm.DB          // 日志数据库
-	DatabaseName           string            // 库名
+	GormClient             *dorm.GormClient // 日志数据库
+	LogClient              *golog.GoLog     // 日志驱动
+	LogDebug               bool             // 日志开关
 }
 
 // Client 微信公众号服务
 type Client struct {
-	client *gorequest.App   // 请求客户端
-	log    *golog.ApiClient // 日志服务
-	config *ConfigClient    // 配置
+	requestClient *gorequest.App   // 请求服务
+	logClient     *golog.ApiClient // 日志服务
+	config        *ConfigClient    // 配置
 }
 
 func NewClient(config *ConfigClient) (*Client, error) {
@@ -36,23 +34,15 @@ func NewClient(config *ConfigClient) (*Client, error) {
 	var err error
 	c := &Client{config: config}
 
-	c.client = gorequest.NewHttp()
+	c.requestClient = 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.logClient, 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
 		}

const.go

@@ -8,4 +8,4 @@ const (
 	logTable = "wechatopen"
 )
 
-const Version = "1.0.10"
+const Version = "1.0.11"

go.mod

@@ -4,10 +4,9 @@ go 1.19
 
 require (
 	github.com/mitchellh/mapstructure v1.5.0
-	go.dtapp.net/dorm v1.0.19
-	go.dtapp.net/golog v1.0.26
+	go.dtapp.net/dorm v1.0.21
+	go.dtapp.net/golog v1.0.27
 	go.dtapp.net/gorequest v1.0.26
-	gorm.io/gorm v1.23.8
 )
 
 require (
@@ -86,6 +85,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

go.sum

@@ -502,14 +502,14 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-go.dtapp.net/dorm v1.0.19 h1:3uH4tYZ5zH4knx9o6BJlE3rFiWNWTyMxlpt0Cwoq7zE=
-go.dtapp.net/dorm v1.0.19/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
+go.dtapp.net/dorm v1.0.21 h1:e5GccTOkFJ66+fTBu0Voo45Cpj+NKsVYLmq2IKQbH+w=
+go.dtapp.net/dorm v1.0.21/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
 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=

request.go

@@ -8,7 +8,7 @@ import (
 func (c *Client) request(ctx context.Context, url string, params map[string]interface{}, method string) (resp gorequest.Response, err error) {
 
 	// 创建请求
-	client := c.client
+	client := c.requestClient
 
 	// 设置请求地址
 	client.SetUri(url)
@@ -29,11 +29,8 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
 	}
 
 	// 日志
-	if c.config.PgsqlDb != nil {
-		go c.log.GormMiddleware(ctx, request, Version)
-	}
-	if c.config.MongoDb != nil {
-		go c.log.MongoMiddleware(ctx, request, Version)
+	if c.config.GormClient.Db != nil {
+		go c.logClient.GormMiddleware(ctx, request, Version)
 	}
 
 	return request, err