From 25be183cacba5d5aaa8ff10fb64817b2df62b277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Sat, 28 May 2022 00:48:36 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod             |  2 +-
 go.sum             |  2 ++
 gotime/mongo.go    |  6 ++++++
 leshuazf/app.go    | 12 ++++++------
 vendor/modules.txt |  2 +-
 5 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 gotime/mongo.go

diff --git a/go.mod b/go.mod
index 31e3d5c2..8bc8358a 100644
--- a/go.mod
+++ b/go.mod
@@ -96,7 +96,7 @@ require (
 	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
 	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
 	golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
-	google.golang.org/genproto v0.0.0-20220526192754-51939a95c655 // indirect
+	google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/go.sum b/go.sum
index 69f14fd2..b7251aaa 100644
--- a/go.sum
+++ b/go.sum
@@ -586,6 +586,8 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY
 google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/genproto v0.0.0-20220526192754-51939a95c655 h1:56rmjc5LUAanErbiNrY+s/Nd47wDQEJkpqS7i43M1I0=
 google.golang.org/genproto v0.0.0-20220526192754-51939a95c655/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
+google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 h1:a221mAAEAzq4Lz6ZWRkcS8ptb2mxoxYSt4N68aRyQHM=
+google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
diff --git a/gotime/mongo.go b/gotime/mongo.go
new file mode 100644
index 00000000..314fe541
--- /dev/null
+++ b/gotime/mongo.go
@@ -0,0 +1,6 @@
+package gotime
+
+// Bson mongoDB
+func (p Pro) Bson() string {
+	return p.Now().String()
+}
diff --git a/leshuazf/app.go b/leshuazf/app.go
index 6a07f7cc..cfa13dc1 100644
--- a/leshuazf/app.go
+++ b/leshuazf/app.go
@@ -1,11 +1,11 @@
 package leshuazf
 
 import (
+	"go.dtapp.net/library/golog"
 	"go.dtapp.net/library/gomongo"
 	"go.dtapp.net/library/gorandom"
 	"go.dtapp.net/library/gorequest"
 	"go.dtapp.net/library/gotime"
-	"go.dtapp.net/library/utils/golog"
 	"gorm.io/gorm"
 )
 
@@ -17,7 +17,7 @@ type App struct {
 	mongo        *gomongo.Client // 日志数据库
 	pgsql        *gorm.DB        // pgsql数据库
 	client       *gorequest.App  // 请求客户端
-	log          *golog.Client   // 日志服务
+	log          *golog.Api      // 日志服务
 	logTableName string          // 日志表名
 	logStatus    bool            // 日志状态
 }
@@ -29,7 +29,10 @@ func NewApp(agentId string, environment string, keyAgent string, pgsql *gorm.DB)
 		app.pgsql = pgsql
 		app.logStatus = true
 		app.logTableName = "leshuazf"
-		app.log = golog.NewClientApi(pgsql, app.logTableName)
+		app.log = golog.NewApi(&golog.ApiConfig{
+			Db:        pgsql,
+			TableName: app.logTableName,
+		})
 	}
 	return app
 }
@@ -71,9 +74,6 @@ func (app *App) request(url string, params map[string]interface{}, method string
 	}
 
 	// 日志
-	if app.mongo != nil && app.mongo.Db != nil {
-		go app.mongoLog(request)
-	}
 	if app.logStatus == true {
 		go app.postgresqlLog(request)
 	}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 9bbb5057..7549ec08 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -449,7 +449,7 @@ golang.org/x/text/width
 # golang.org/x/time v0.0.0-20220411224347-583f2d630306
 ## explicit
 golang.org/x/time/rate
-# google.golang.org/genproto v0.0.0-20220526192754-51939a95c655
+# google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58
 ## explicit; go 1.15
 google.golang.org/genproto/googleapis/api/annotations
 google.golang.org/genproto/googleapis/rpc/status