- update log

2 years ago · 32dbfb31a0
parent 2b8404a678
commit 32dbfb31a0
6 changed files with 38 additions and 52 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,4 +6,5 @@
 *.log
 goinit.sh
 gomod.sh
-*_test.go
+*_test.go
+/vendor/
--- a/client.go
+++ b/client.go
@ -4,22 +4,21 @@ import (
 	"go.dtapp.net/dorm"
 	"go.dtapp.net/golog"
 	"go.dtapp.net/gorequest"
-	"gorm.io/gorm"
 )

 type ConfigClient struct {
-	CustomerId   int               // 商家编号
-	CustomerKey  string            // 商家密钥
-	MongoDb      *dorm.MongoClient // 日志数据库
-	PgsqlDb      *gorm.DB          // 日志数据库
-	DatabaseName string            // 库名
+	CustomerId  int              // 商家编号
+	CustomerKey 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) {
@ -27,23 +26,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
 		}
--- a/const.go
+++ b/const.go
@ -17,4 +17,4 @@ const (
 	logTable = "kashangwl"
 )

-const Version = "1.0.4"
+const Version = "1.0.5"
--- a/go.mod
+++ b/go.mod
@ -3,10 +3,9 @@ module go.dtapp.net/kashangwl
 go 1.19

 require (
-	go.dtapp.net/dorm v1.0.17
-	go.dtapp.net/golog v1.0.24
+	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 (
@ -62,12 +61,12 @@ require (
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
-	go.dtapp.net/goip v1.0.24 // indirect
+	go.dtapp.net/goip v1.0.25 // indirect
 	go.dtapp.net/gojson v1.0.1 // indirect
 	go.dtapp.net/gorandom v1.0.1 // indirect
 	go.dtapp.net/gostring v1.0.6 // indirect
 	go.dtapp.net/gotime v1.0.5 // indirect
-	go.dtapp.net/gotrace_id v1.0.0 // indirect
+	go.dtapp.net/gotrace_id v1.0.2 // indirect
 	go.dtapp.net/gourl v1.0.0 // indirect
 	go.dtapp.net/goxml v1.0.1 // indirect
 	go.mongodb.org/mongo-driver v1.10.1 // indirect
@ -85,6 +84,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
--- a/go.sum
+++ b/go.sum
@ -500,14 +500,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.17 h1:3VQKUl05CDxFg3T1c/M8wYf2I+H+oVGBDh4NCV30nn0=
-go.dtapp.net/dorm v1.0.17/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
-go.dtapp.net/goip v1.0.24 h1:62k3xt9I/YLUwA5tLp7YC8XPskkswc4RJrvxRRxjwIY=
-go.dtapp.net/goip v1.0.24/go.mod h1:tps0yoq5kSykLGDb01vuai47hzAQ6nYUPFWLdlQA2Oo=
+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.24 h1:A26GN2fEJOsMWRb+jqG2LKRmB8aEuWFYNNXGT23VNbc=
-go.dtapp.net/golog v1.0.24/go.mod h1:P1CFwGZ6xm2nLXCi0DTwO8aHNfT2dkdjz+9b2ph1TNQ=
+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=
@ -516,8 +516,8 @@ go.dtapp.net/gostring v1.0.6 h1:XqNaThEfHpweLofru5sBqm1UUzc9JWsXyB/M/rTk29w=
 go.dtapp.net/gostring v1.0.6/go.mod h1:AMnnLjyNxH+cphxyASJGYCzWpVrkP5RncuVo8xL8s3E=
 go.dtapp.net/gotime v1.0.5 h1:12aNgB2ULpP6QgQHEUkLilZ4ASvhpFxMFQkBwn0par8=
 go.dtapp.net/gotime v1.0.5/go.mod h1:Gq7eNLr2iMLP18UNWONRq4V3Uhf/ADp4bIrS+Tc6ktY=
-go.dtapp.net/gotrace_id v1.0.0 h1:nlI8KEEf2l394SCzmJxffEIiOBfR4kIOuobBhpRSV3g=
-go.dtapp.net/gotrace_id v1.0.0/go.mod h1:HDwMY1vLoC759z6VGKVgCpIqwKQTDYV9DNdxiyN1OeQ=
+go.dtapp.net/gotrace_id v1.0.2 h1:wSc7dYzkAwSz3MbPu2Io4XqHe0l0dIaJe3vlpDAZrXY=
+go.dtapp.net/gotrace_id v1.0.2/go.mod h1:476T5KMJw9c6DM/rJn7y6d28hcNDv4+wew4sd+powes=
 go.dtapp.net/gourl v1.0.0 h1:Zbe0GiMFyyRy2+bjbVsYulakH5d58w3CDZkUPonlMoQ=
 go.dtapp.net/gourl v1.0.0/go.mod h1:x9A/pJ3iKDTb6Gu2RtJy2iHg56IowXIcIGQdogqpGjs=
 go.dtapp.net/goxml v1.0.1 h1:WODsjNpmHTtoeLsXgOjC81qRbu4aXZ3LKBHApNGaPjY=
--- a/request.go
+++ b/request.go
@ -16,7 +16,7 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
 	params["sign"] = c.getSign(c.GetCustomerKey(), params)

 	// 创建请求
-	client := c.client
+	client := c.requestClient

 	// 设置请求地址
 	client.SetUri(url)
@ -34,11 +34,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
@ -47,7 +44,7 @@ func (c *Client) request(ctx context.Context, url string, params map[string]inte
 func (c *Client) requestCache(ctx context.Context, url string, params map[string]interface{}, method string) (gorequest.Response, error) {

 	// 创建请求
-	client := c.client
+	client := c.requestClient

 	// 设置请求地址
 	client.SetUri(url)
@ -68,11 +65,8 @@ func (c *Client) requestCache(ctx context.Context, url string, params map[string
 	}

 	// 日志
-	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