- optimization gorm

- update api

.gitignore

@@ -6,4 +6,5 @@
 *.log
 gomod.sh
 *_test.go
+mod.sh
 /vendor/

README.md

@@ -1,7 +1,9 @@
 <h1>
-<a href="https://www.dtapp.net/">Golang Log</a>
+<a href="https://www.dtapp.net/">Golang</a>
 </h1>
 
+📦 Golang 日志
+
 [comment]: <> (go)
 [![godoc](https://pkg.go.dev/badge/go.dtapp.net/golog?status.svg)](https://pkg.go.dev/go.dtapp.net/golog)
 [![goproxy.cn](https://goproxy.cn/stats/go.dtapp.net/golog/badges/download-count.svg)](https://goproxy.cn/stats/go.dtapp.net/golog)
@@ -10,6 +12,6 @@
 
 #### 安装
 
-```go
-go get -v -u go.dtapp.net/golog
+```shell
+go get -v -u go.dtapp.net/golog@v1.0.109
 ```

api.go

@@ -1,161 +0,0 @@
-package golog
-
-import (
-	"context"
-	"errors"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goip"
-	"go.dtapp.net/gorequest"
-	"os"
-	"runtime"
-)
-
-// ApiClient 接口
-type ApiClient struct {
-	gormClient  *dorm.GormClient  // 数据库驱动
-	mongoClient *dorm.MongoClient // 数据库驱动
-	zapLog      *ZapLog           // 日志服务
-	gormConfig  struct {
-		tableName string // 表名
-		insideIp  string // 内网ip
-		hostname  string // 主机名
-		goVersion string // go版本
-		debug     bool   // 日志开关
-	}
-	mongoConfig struct {
-		databaseName   string // 库名
-		collectionName string // 表名
-		insideIp       string // 内网ip
-		hostname       string // 主机名
-		goVersion      string // go版本
-		debug          bool   // 日志开关
-	}
-	log struct {
-		gorm  bool // 日志开关
-		mongo bool // 日志开关
-	}
-}
-
-// client 数据库服务
-// string 表名
-type apiGormClientFun func() (*dorm.GormClient, string)
-
-// client 数据库服务
-// string 库名
-// string 表名
-type apiMongoClientFun func() (*dorm.MongoClient, string, string)
-
-// ApiClientConfig 接口实例配置
-type ApiClientConfig struct {
-	GormClientFun  apiGormClientFun  // 日志配置
-	MongoClientFun apiMongoClientFun // 日志配置
-	Debug          bool              // 日志开关
-	ZapLog         *ZapLog           // 日志服务
-}
-
-// NewApiClient 创建接口实例化
-// client 数据库服务
-// tableName 表名
-func NewApiClient(config *ApiClientConfig) (*ApiClient, error) {
-
-	var ctx = context.Background()
-
-	c := &ApiClient{}
-
-	c.zapLog = config.ZapLog
-
-	gormClient, gormTableName := config.GormClientFun()
-	mongoClient, mongoDatabaseName, mongoCollectionName := config.MongoClientFun()
-
-	if (gormClient == nil || gormClient.Db == nil) || (mongoClient == nil || mongoClient.Db == nil) {
-		return nil, errors.New("没有设置驱动")
-	}
-
-	hostname, _ := os.Hostname()
-
-	if gormClient != nil || gormClient.Db != nil {
-
-		c.gormClient = gormClient
-
-		if gormTableName == "" {
-			return nil, errors.New("没有设置表名")
-		}
-		c.gormConfig.tableName = gormTableName
-
-		c.gormConfig.debug = config.Debug
-
-		err := c.gormAutoMigrate()
-		if err != nil {
-			return nil, errors.New("创建表失败：" + err.Error())
-		}
-
-		c.gormConfig.hostname = hostname
-		c.gormConfig.insideIp = goip.GetInsideIp(ctx)
-		c.gormConfig.goVersion = runtime.Version()
-
-		c.log.gorm = true
-
-	}
-
-	if mongoClient != nil || mongoClient.Db != nil {
-
-		c.mongoClient = mongoClient
-
-		if mongoDatabaseName == "" {
-			return nil, errors.New("没有设置库名")
-		}
-		c.mongoConfig.databaseName = mongoDatabaseName
-
-		if mongoCollectionName == "" {
-			return nil, errors.New("没有设置表名")
-		}
-		c.mongoConfig.collectionName = mongoCollectionName
-
-		c.mongoConfig.debug = config.Debug
-
-		c.mongoConfig.hostname = hostname
-		c.mongoConfig.insideIp = goip.GetInsideIp(ctx)
-		c.mongoConfig.goVersion = runtime.Version()
-
-		c.log.mongo = true
-
-		// 创建时间序列集合
-		c.mongoCreateCollection()
-
-		// 创建索引
-		c.mongoCreateIndexes()
-
-	}
-
-	return c, nil
-}
-
-// Middleware 中间件
-func (c *ApiClient) Middleware(ctx context.Context, request gorequest.Response, sdkVersion string) {
-	if c.log.gorm {
-		c.GormMiddleware(ctx, request, sdkVersion)
-	}
-	if c.log.mongo {
-		c.MongoMiddleware(ctx, request, sdkVersion)
-	}
-}
-
-// MiddlewareXml 中间件
-func (c *ApiClient) MiddlewareXml(ctx context.Context, request gorequest.Response, sdkVersion string) {
-	if c.log.gorm {
-		c.GormMiddlewareXml(ctx, request, sdkVersion)
-	}
-	if c.log.mongo {
-		c.MongoMiddlewareXml(ctx, request, sdkVersion)
-	}
-}
-
-// MiddlewareCustom 中间件
-func (c *ApiClient) MiddlewareCustom(ctx context.Context, api string, request gorequest.Response, sdkVersion string) {
-	if c.log.gorm {
-		c.GormMiddlewareCustom(ctx, api, request, sdkVersion)
-	}
-	if c.log.mongo {
-		c.MongoMiddlewareCustom(ctx, api, request, sdkVersion)
-	}
-}

api_gorm.go

@@ -3,217 +3,87 @@ package golog
 import (
 	"context"
 	"errors"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goip"
 	"go.dtapp.net/gorequest"
-	"go.dtapp.net/gotrace_id"
-	"go.dtapp.net/gourl"
-	"gorm.io/datatypes"
 	"gorm.io/gorm"
-	"os"
-	"runtime"
-	"time"
-	"unicode/utf8"
 )
 
-// ApiGormClientConfig 接口实例配置
-type ApiGormClientConfig struct {
-	GormClientFun apiGormClientFun // 日志配置
-	Debug         bool             // 日志开关
-	ZapLog        *ZapLog          // 日志服务
-}
-
-// NewApiGormClient 创建接口实例化
-// client 数据库服务
-// tableName 表名
-func NewApiGormClient(config *ApiGormClientConfig) (*ApiClient, error) {
-
-	var ctx = context.Background()
-
-	c := &ApiClient{}
-
-	c.zapLog = config.ZapLog
-
-	client, tableName := config.GormClientFun()
-
-	if client == nil || client.Db == nil {
-		return nil, errors.New("没有设置驱动")
+// ApiGorm 接口日志
+type ApiGorm struct {
+	gormClient *gorm.DB // 数据库驱动
+	config     struct {
+		systemHostname      string  // 主机名
+		systemOs            string  // 系统类型
+		systemVersion       string  // 系统版本
+		systemKernel        string  // 系统内核
+		systemKernelVersion string  // 系统内核版本
+		systemBootTime      uint64  // 系统开机时间
+		cpuCores            int     // CPU核数
+		cpuModelName        string  // CPU型号名称
+		cpuMhz              float64 // CPU兆赫
+		systemInsideIp      string  // 内网ip
+		systemOutsideIp     string  // 外网ip
+		goVersion           string  // go版本
+		sdkVersion          string  // sdk版本
 	}
-
-	c.gormClient = client
-
-	if tableName == "" {
-		return nil, errors.New("没有设置表名")
+	gormConfig struct {
+		stats     bool   // 状态
+		tableName string // 表名
 	}
-	c.gormConfig.tableName = tableName
-
-	c.gormConfig.debug = config.Debug
-
-	err := c.gormAutoMigrate()
-	if err != nil {
-		return nil, errors.New("创建表失败：" + err.Error())
-	}
-
-	hostname, _ := os.Hostname()
+}
 
-	c.gormConfig.hostname = hostname
-	c.gormConfig.insideIp = goip.GetInsideIp(ctx)
-	c.gormConfig.goVersion = runtime.Version()
+// ApiGormFun 接口日志驱动
+type ApiGormFun func() *ApiGorm
 
-	c.log.gorm = true
+// NewApiGorm 创建接口实例化
+func NewApiGorm(ctx context.Context, systemOutsideIp string, gormClient *gorm.DB, gormTableName string) (*ApiGorm, error) {
 
-	return c, nil
-}
+	gl := &ApiGorm{}
 
-// 创建模型
-func (c *ApiClient) gormAutoMigrate() (err error) {
-	err = c.gormClient.Db.Table(c.gormConfig.tableName).AutoMigrate(&apiPostgresqlLog{})
-	if err != nil {
-		c.zapLog.WithLogger().Sugar().Infof("[golog.api.gormAutoMigrate]：%s", err)
+	// 配置信息
+	if systemOutsideIp == "" {
+		return nil, errors.New("没有设置外网IP")
 	}
-	return
-}
+	gl.setConfig(ctx, systemOutsideIp)
 
-// 模型结构体
-type apiPostgresqlLog struct {
-	LogId                 uint           `gorm:"primaryKey;comment:【记录】编号" json:"log_id,omitempty"`           //【记录】编号
-	TraceId               string         `gorm:"index;comment:【系统】跟踪编号" json:"trace_id,omitempty"`            //【系统】跟踪编号
-	RequestTime           time.Time      `gorm:"index;comment:【请求】时间" json:"request_time,omitempty"`          //【请求】时间
-	RequestUri            string         `gorm:"comment:【请求】链接" json:"request_uri,omitempty"`                 //【请求】链接
-	RequestUrl            string         `gorm:"comment:【请求】链接" json:"request_url,omitempty"`                 //【请求】链接
-	RequestApi            string         `gorm:"index;comment:【请求】接口" json:"request_api,omitempty"`           //【请求】接口
-	RequestMethod         string         `gorm:"index;comment:【请求】方式" json:"request_method,omitempty"`        //【请求】方式
-	RequestParams         datatypes.JSON `gorm:"type:jsonb;comment:【请求】参数" json:"request_params,omitempty"`   //【请求】参数
-	RequestHeader         datatypes.JSON `gorm:"type:jsonb;comment:【请求】头部" json:"request_header,omitempty"`   //【请求】头部
-	ResponseHeader        datatypes.JSON `gorm:"type:jsonb;comment:【返回】头部" json:"response_header,omitempty"`  //【返回】头部
-	ResponseStatusCode    int            `gorm:"index;comment:【返回】状态码" json:"response_status_code,omitempty"` //【返回】状态码
-	ResponseBody          datatypes.JSON `gorm:"type:jsonb;comment:【返回】数据" json:"response_body,omitempty"`    //【返回】数据
-	ResponseContent       string         `gorm:"comment:【返回】内容" json:"response_content,omitempty"`            //【返回】内容
-	ResponseContentLength int64          `gorm:"comment:【返回】大小" json:"response_content_length,omitempty"`     //【返回】大小
-	ResponseTime          time.Time      `gorm:"index;comment:【返回】时间" json:"response_time,omitempty"`         //【返回】时间
-	SystemHostName        string         `gorm:"index;comment:【系统】主机名" json:"system_host_name,omitempty"`     //【系统】主机名
-	SystemInsideIp        string         `gorm:"index;comment:【系统】内网ip" json:"system_inside_ip,omitempty"`    //【系统】内网ip
-	GoVersion             string         `gorm:"index;comment:【程序】Go版本" json:"go_version,omitempty"`          //【程序】Go版本
-	SdkVersion            string         `gorm:"index;comment:【程序】Sdk版本" json:"sdk_version,omitempty"`        //【程序】Sdk版本
-}
+	if gormClient == nil {
+		gl.gormConfig.stats = false
+	} else {
 
-// 记录日志
-func (c *ApiClient) gormRecord(ctx context.Context, postgresqlLog apiPostgresqlLog) (err error) {
+		gl.gormClient = gormClient
 
-	if utf8.ValidString(string(postgresqlLog.ResponseBody)) == false {
-		postgresqlLog.ResponseBody = datatypes.JSON("")
-	}
+		if gormTableName == "" {
+			return nil, errors.New("没有设置表名")
+		} else {
+			gl.gormConfig.tableName = gormTableName
+		}
 
-	postgresqlLog.SystemHostName = c.gormConfig.hostname
-	postgresqlLog.SystemInsideIp = c.gormConfig.insideIp
-	postgresqlLog.GoVersion = c.gormConfig.goVersion
+		// 创建模型
+		gl.gormAutoMigrate(ctx)
 
-	postgresqlLog.TraceId = gotrace_id.GetTraceIdContext(ctx)
+		gl.gormConfig.stats = true
 
-	err = c.gormClient.Db.Table(c.gormConfig.tableName).Create(&postgresqlLog).Error
-	if err != nil {
-		c.zapLog.WithLogger().Sugar().Errorf("[golog.api.gormRecord]：%s", err)
 	}
 
-	return
+	return gl, nil
 }
 
-// GormQuery 查询
-func (c *ApiClient) GormQuery() *gorm.DB {
-	return c.gormClient.Db.Table(c.gormConfig.tableName)
-}
-
-// GormMiddleware 中间件
-func (c *ApiClient) GormMiddleware(ctx context.Context, request gorequest.Response, sdkVersion string) {
-	data := apiPostgresqlLog{
-		RequestTime:           request.RequestTime,                                            //【请求】时间
-		RequestUri:            request.RequestUri,                                             //【请求】链接
-		RequestUrl:            gourl.UriParse(request.RequestUri).Url,                         //【请求】链接
-		RequestApi:            gourl.UriParse(request.RequestUri).Path,                        //【请求】接口
-		RequestMethod:         request.RequestMethod,                                          //【请求】方式
-		RequestParams:         datatypes.JSON(dorm.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
-		RequestHeader:         datatypes.JSON(dorm.JsonEncodeNoError(request.RequestHeader)),  //【请求】头部
-		ResponseHeader:        datatypes.JSON(dorm.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                                     //【返回】状态码
-		ResponseContentLength: request.ResponseContentLength,                                  //【返回】大小
-		ResponseTime:          request.ResponseTime,                                           //【返回】时间
-		SdkVersion:            sdkVersion,                                                     //【程序】Sdk版本
-	}
-	if request.HeaderIsImg() {
-		c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddleware.isimg]：%s %s", data.RequestUri, request.ResponseHeader.Get("Content-Type"))
-	} else {
-		if len(dorm.JsonEncodeNoError(request.ResponseBody)) > 0 {
-			data.ResponseBody = request.ResponseBody                            //【返回】数据
-			data.ResponseContent = dorm.JsonEncodeNoError(request.ResponseBody) //【返回】数据
-		} else {
-			c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddleware.len]：%s %s", data.RequestUri, request.ResponseBody)
-		}
-	}
-	err := c.gormRecord(ctx, data)
-	if err != nil {
-		c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.GormMiddleware]：%s", err.Error())
+// Middleware 中间件
+func (ag *ApiGorm) Middleware(ctx context.Context, request gorequest.Response) {
+	if ag.gormConfig.stats {
+		ag.gormMiddleware(ctx, request)
 	}
 }
 
-// GormMiddlewareXml 中间件
-func (c *ApiClient) GormMiddlewareXml(ctx context.Context, request gorequest.Response, sdkVersion string) {
-	data := apiPostgresqlLog{
-		RequestTime:           request.RequestTime,                                            //【请求】时间
-		RequestUri:            request.RequestUri,                                             //【请求】链接
-		RequestUrl:            gourl.UriParse(request.RequestUri).Url,                         //【请求】链接
-		RequestApi:            gourl.UriParse(request.RequestUri).Path,                        //【请求】接口
-		RequestMethod:         request.RequestMethod,                                          //【请求】方式
-		RequestParams:         datatypes.JSON(dorm.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
-		RequestHeader:         datatypes.JSON(dorm.JsonEncodeNoError(request.RequestHeader)),  //【请求】头部
-		ResponseHeader:        datatypes.JSON(dorm.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                                     //【返回】状态码
-		ResponseContentLength: request.ResponseContentLength,                                  //【返回】大小
-		ResponseTime:          request.ResponseTime,                                           //【返回】时间
-		SdkVersion:            sdkVersion,                                                     //【程序】Sdk版本
-	}
-	if request.HeaderIsImg() {
-		c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareXml.isimg]：%s %s", data.RequestUri, request.ResponseHeader.Get("Content-Type"))
-	} else {
-		if len(dorm.JsonEncodeNoError(request.ResponseBody)) > 0 {
-			data.ResponseContent = dorm.JsonEncodeNoError(request.ResponseBody) //【返回】内容
-		} else {
-			c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareXml.len]：%s %s", data.RequestUri, request.ResponseBody)
-		}
-	}
-	err := c.gormRecord(ctx, data)
-	if err != nil {
-		c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.GormMiddlewareXml]：%s", err.Error())
+// MiddlewareXml 中间件
+func (ag *ApiGorm) MiddlewareXml(ctx context.Context, request gorequest.Response) {
+	if ag.gormConfig.stats {
+		ag.gormMiddlewareXml(ctx, request)
 	}
 }
 
-// GormMiddlewareCustom 中间件
-func (c *ApiClient) GormMiddlewareCustom(ctx context.Context, api string, request gorequest.Response, sdkVersion string) {
-	data := apiPostgresqlLog{
-		RequestTime:           request.RequestTime,                                            //【请求】时间
-		RequestUri:            request.RequestUri,                                             //【请求】链接
-		RequestUrl:            gourl.UriParse(request.RequestUri).Url,                         //【请求】链接
-		RequestApi:            api,                                                            //【请求】接口
-		RequestMethod:         request.RequestMethod,                                          //【请求】方式
-		RequestParams:         datatypes.JSON(dorm.JsonEncodeNoError(request.RequestParams)),  //【请求】参数
-		RequestHeader:         datatypes.JSON(dorm.JsonEncodeNoError(request.RequestHeader)),  //【请求】头部
-		ResponseHeader:        datatypes.JSON(dorm.JsonEncodeNoError(request.ResponseHeader)), //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                                     //【返回】状态码
-		ResponseContentLength: request.ResponseContentLength,                                  //【返回】大小
-		ResponseTime:          request.ResponseTime,                                           //【返回】时间
-		SdkVersion:            sdkVersion,                                                     //【程序】Sdk版本
-	}
-	if request.HeaderIsImg() {
-		c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareCustom.isimg]：%s %s", data.RequestUri, request.ResponseHeader.Get("Content-Type"))
-	} else {
-		if len(dorm.JsonEncodeNoError(request.ResponseBody)) > 0 {
-			data.ResponseBody = request.ResponseBody                            //【返回】数据
-			data.ResponseContent = dorm.JsonEncodeNoError(request.ResponseBody) //【返回】数据
-		} else {
-			c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareCustom.len]：%s %s", data.RequestUri, request.ResponseBody)
-		}
-	}
-	err := c.gormRecord(ctx, data)
-	if err != nil {
-		c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.GormMiddlewareCustom]：%s", err.Error())
+// MiddlewareCustom 中间件
+func (ag *ApiGorm) MiddlewareCustom(ctx context.Context, api string, request gorequest.Response) {
+	if ag.gormConfig.stats {
+		ag.gormMiddlewareCustom(ctx, api, request)
 	}
 }

api_gorm_config.go

@@ -0,0 +1,29 @@
+package golog
+
+import (
+	"context"
+	"go.dtapp.net/gorequest"
+	"runtime"
+)
+
+func (ag *ApiGorm) setConfig(ctx context.Context, systemOutsideIp string) {
+
+	info := getSystem()
+
+	ag.config.systemHostname = info.SystemHostname
+	ag.config.systemOs = info.SystemOs
+	ag.config.systemVersion = info.SystemVersion
+	ag.config.systemKernel = info.SystemKernel
+	ag.config.systemKernelVersion = info.SystemKernelVersion
+	ag.config.systemBootTime = info.SystemBootTime
+	ag.config.cpuCores = info.CpuCores
+	ag.config.cpuModelName = info.CpuModelName
+	ag.config.cpuMhz = info.CpuMhz
+
+	ag.config.systemInsideIp = gorequest.GetInsideIp(ctx)
+	ag.config.systemOutsideIp = systemOutsideIp
+
+	ag.config.goVersion = runtime.Version()
+	ag.config.sdkVersion = Version
+
+}

api_gorm_delete.go

@@ -0,0 +1,24 @@
+package golog
+
+import (
+	"context"
+	"errors"
+	"go.dtapp.net/gotime"
+)
+
+// GormDeleteData 删除N天前数据
+func (ag *ApiGorm) GormDeleteData(ctx context.Context, day int) error {
+	return ag.GormDeleteDataCustom(ctx, ag.gormConfig.tableName, day)
+}
+
+// GormDeleteDataCustom 删除N天前数据
+func (ag *ApiGorm) GormDeleteDataCustom(ctx context.Context, tableName string, day int) error {
+	if ag.gormConfig.stats == false {
+		return nil
+	}
+
+	if tableName == "" {
+		return errors.New("没有设置表名")
+	}
+	return ag.gormClient.Table(tableName).Where("request_time < ?", gotime.Current().BeforeDay(day).Format()).Delete(&apiPostgresqlLog{}).Error
+}

api_gorm_record.go

@@ -0,0 +1,143 @@
+package golog
+
+import (
+	"context"
+	"go.dtapp.net/gojson"
+	"go.dtapp.net/gorequest"
+	"go.dtapp.net/gotrace_id"
+	"go.dtapp.net/gourl"
+	"log"
+	"time"
+	"unicode/utf8"
+)
+
+// 模型
+type apiGormLog struct {
+	LogID              int64     `gorm:"primaryKey;comment:【记录】编号" json:"log_id,omitempty"`                  //【记录】编号
+	TraceID            string    `gorm:"index;comment:【系统】跟踪编号" json:"trace_id,omitempty"`                   //【系统】跟踪编号
+	RequestTime        time.Time `gorm:"index;comment:【请求】时间" json:"request_time,omitempty"`                 //【请求】时间
+	RequestUri         string    `gorm:"comment:【请求】链接" json:"request_uri,omitempty"`                        //【请求】链接
+	RequestUrl         string    `gorm:"comment:【请求】链接" json:"request_url,omitempty"`                        //【请求】链接
+	RequestApi         string    `gorm:"index;comment:【请求】接口" json:"request_api,omitempty"`                  //【请求】接口
+	RequestMethod      string    `gorm:"index;comment:【请求】方式" json:"request_method,omitempty"`               //【请求】方式
+	RequestParams      string    `gorm:"comment:【请求】参数" json:"request_params,omitempty"`                     //【请求】参数
+	RequestHeader      string    `gorm:"comment:【请求】头部" json:"request_header,omitempty"`                     //【请求】头部
+	RequestIp          string    `gorm:"default:0.0.0.0;index;comment:【请求】请求Ip" json:"request_ip,omitempty"` //【请求】请求Ip
+	ResponseHeader     string    `gorm:"comment:【返回】头部" json:"response_header,omitempty"`                    //【返回】头部
+	ResponseStatusCode int       `gorm:"index;comment:【返回】状态码" json:"response_status_code,omitempty"`        //【返回】状态码
+	ResponseBody       string    `gorm:"comment:【返回】数据" json:"response_body,omitempty"`                      //【返回】数据
+	ResponseTime       time.Time `gorm:"index;comment:【返回】时间" json:"response_time,omitempty"`                //【返回】时间
+	SystemHostName     string    `gorm:"index;comment:【系统】主机名" json:"system_host_name,omitempty"`            //【系统】主机名
+	SystemInsideIp     string    `gorm:"default:0.0.0.0;comment:【系统】内网ip" json:"system_inside_ip,omitempty"` //【系统】内网ip
+	SystemOs           string    `gorm:"index;comment:【系统】系统类型" json:"system_os,omitempty"`                  //【系统】系统类型
+	SystemArch         string    `gorm:"index;comment:【系统】系统架构" json:"system_arch,omitempty"`                //【系统】系统架构
+	GoVersion          string    `gorm:"comment:【程序】Go版本" json:"go_version,omitempty"`                       //【程序】Go版本
+	SdkVersion         string    `gorm:"comment:【程序】Sdk版本" json:"sdk_version,omitempty"`                     //【程序】Sdk版本
+}
+
+// 创建模型
+func (ag *ApiGorm) gormAutoMigrate(ctx context.Context) {
+	if ag.gormConfig.stats == false {
+		return
+	}
+
+	err := ag.gormClient.Table(ag.gormConfig.tableName).AutoMigrate(&apiGormLog{})
+	if err != nil {
+		log.Printf("创建模型：%s", err)
+	}
+}
+
+// 记录日志
+func (ag *ApiGorm) gormRecord(ctx context.Context, data apiGormLog) {
+	if ag.gormConfig.stats == false {
+		return
+	}
+
+	if utf8.ValidString(data.ResponseBody) == false {
+		data.ResponseBody = ""
+	}
+
+	data.SystemHostName = ag.config.systemHostname   //【系统】主机名
+	data.SystemInsideIp = ag.config.systemInsideIp   //【系统】内网ip
+	data.GoVersion = ag.config.goVersion             //【程序】Go版本
+	data.SdkVersion = ag.config.systemVersion        //【程序】Sdk版本
+	data.TraceID = gotrace_id.GetTraceIdContext(ctx) //【记录】跟踪编号
+	data.RequestIp = ag.config.systemOutsideIp       //【请求】请求Ip
+	data.SystemOs = ag.config.systemOs               //【系统】系统类型
+	data.SystemArch = ag.config.systemKernel         //【系统】系统架构
+
+	err := ag.gormClient.Table(ag.gormConfig.tableName).Create(&data).Error
+	if err != nil {
+		log.Printf("记录接口日志错误：%s", err)
+		log.Printf("记录接口日志数据：%+v", data)
+	}
+}
+
+// 中间件
+func (ag *ApiGorm) gormMiddleware(ctx context.Context, request gorequest.Response) {
+	data := apiGormLog{
+		RequestTime:        request.RequestTime,                              //【请求】时间
+		RequestUri:         request.RequestUri,                               //【请求】链接
+		RequestUrl:         gourl.UriParse(request.RequestUri).Url,           //【请求】链接
+		RequestApi:         gourl.UriParse(request.RequestUri).Path,          //【请求】接口
+		RequestMethod:      request.RequestMethod,                            //【请求】方式
+		RequestParams:      gojson.JsonEncodeNoError(request.RequestParams),  //【请求】参数
+		RequestHeader:      gojson.JsonEncodeNoError(request.RequestHeader),  //【请求】头部
+		ResponseHeader:     gojson.JsonEncodeNoError(request.ResponseHeader), //【返回】头部
+		ResponseStatusCode: request.ResponseStatusCode,                       //【返回】状态码
+		ResponseTime:       request.ResponseTime,                             //【返回】时间
+	}
+	if !request.HeaderIsImg() {
+		if len(request.ResponseBody) > 0 {
+			data.ResponseBody = gojson.JsonEncodeNoError(gojson.JsonDecodeNoError(string(request.ResponseBody))) //【返回】数据
+		}
+	}
+
+	ag.gormRecord(ctx, data)
+}
+
+// 中间件
+func (ag *ApiGorm) gormMiddlewareXml(ctx context.Context, request gorequest.Response) {
+	data := apiGormLog{
+		RequestTime:        request.RequestTime,                              //【请求】时间
+		RequestUri:         request.RequestUri,                               //【请求】链接
+		RequestUrl:         gourl.UriParse(request.RequestUri).Url,           //【请求】链接
+		RequestApi:         gourl.UriParse(request.RequestUri).Path,          //【请求】接口
+		RequestMethod:      request.RequestMethod,                            //【请求】方式
+		RequestParams:      gojson.JsonEncodeNoError(request.RequestParams),  //【请求】参数
+		RequestHeader:      gojson.JsonEncodeNoError(request.RequestHeader),  //【请求】头部
+		ResponseHeader:     gojson.JsonEncodeNoError(request.ResponseHeader), //【返回】头部
+		ResponseStatusCode: request.ResponseStatusCode,                       //【返回】状态码
+		ResponseTime:       request.ResponseTime,                             //【返回】时间
+	}
+	if !request.HeaderIsImg() {
+		if len(request.ResponseBody) > 0 {
+			data.ResponseBody = gojson.XmlEncodeNoError(gojson.XmlDecodeNoError(request.ResponseBody)) //【返回】内容
+		}
+	}
+
+	ag.gormRecord(ctx, data)
+}
+
+// 中间件
+func (ag *ApiGorm) gormMiddlewareCustom(ctx context.Context, api string, request gorequest.Response) {
+	data := apiGormLog{
+		RequestTime:        request.RequestTime,                              //【请求】时间
+		RequestUri:         request.RequestUri,                               //【请求】链接
+		RequestUrl:         gourl.UriParse(request.RequestUri).Url,           //【请求】链接
+		RequestApi:         api,                                              //【请求】接口
+		RequestMethod:      request.RequestMethod,                            //【请求】方式
+		RequestParams:      gojson.JsonEncodeNoError(request.RequestParams),  //【请求】参数
+		RequestHeader:      gojson.JsonEncodeNoError(request.RequestHeader),  //【请求】头部
+		ResponseHeader:     gojson.JsonEncodeNoError(request.ResponseHeader), //【返回】头部
+		ResponseStatusCode: request.ResponseStatusCode,                       //【返回】状态码
+		ResponseTime:       request.ResponseTime,                             //【返回】时间
+	}
+	if !request.HeaderIsImg() {
+		if len(request.ResponseBody) > 0 {
+			data.ResponseBody = gojson.JsonEncodeNoError(gojson.JsonDecodeNoError(string(request.ResponseBody))) //【返回】数据
+		}
+	}
+
+	ag.gormRecord(ctx, data)
+}

api_mongo.go

@@ -1,259 +0,0 @@
-package golog
-
-import (
-	"context"
-	"errors"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goip"
-	"go.dtapp.net/gorequest"
-	"go.dtapp.net/gotrace_id"
-	"go.dtapp.net/gourl"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"os"
-	"runtime"
-)
-
-// ApiMongoClientConfig 接口实例配置
-type ApiMongoClientConfig struct {
-	MongoClientFun apiMongoClientFun // 日志配置
-	Debug          bool              // 日志开关
-	ZapLog         *ZapLog           // 日志服务
-}
-
-// NewApiMongoClient 创建接口实例化
-// client 数据库服务
-// databaseName 库名
-// collectionName 表名
-func NewApiMongoClient(config *ApiMongoClientConfig) (*ApiClient, error) {
-
-	var ctx = context.Background()
-
-	c := &ApiClient{}
-
-	c.zapLog = config.ZapLog
-
-	client, databaseName, collectionName := config.MongoClientFun()
-
-	if client == nil || client.Db == nil {
-		return nil, errors.New("没有设置驱动")
-	}
-
-	c.mongoClient = client
-
-	if databaseName == "" {
-		return nil, errors.New("没有设置库名")
-	}
-	c.mongoConfig.databaseName = databaseName
-
-	if collectionName == "" {
-		return nil, errors.New("没有设置表名")
-	}
-	c.mongoConfig.collectionName = collectionName
-
-	c.mongoConfig.debug = config.Debug
-
-	hostname, _ := os.Hostname()
-
-	c.mongoConfig.hostname = hostname
-	c.mongoConfig.insideIp = goip.GetInsideIp(ctx)
-	c.mongoConfig.goVersion = runtime.Version()
-
-	c.log.mongo = true
-
-	// 创建时间序列集合
-	c.mongoCreateCollection()
-
-	// 创建索引
-	c.mongoCreateIndexes()
-
-	return c, nil
-}
-
-// 创建时间序列集合
-func (c *ApiClient) mongoCreateCollection() {
-	var commandResult bson.M
-	commandErr := c.mongoClient.Db.Database(c.mongoConfig.databaseName).RunCommand(context.TODO(), bson.D{{
-		"listCollections", 1,
-	}}).Decode(&commandResult)
-	if commandErr != nil {
-		c.zapLog.WithLogger().Sugar().Errorf("检查时间序列集合：%s", commandErr)
-	} else {
-		err := c.mongoClient.Db.Database(c.mongoConfig.databaseName).CreateCollection(context.TODO(), c.mongoConfig.collectionName, options.CreateCollection().SetTimeSeriesOptions(options.TimeSeries().SetTimeField("request_time")))
-		if err != nil {
-			c.zapLog.WithLogger().Sugar().Errorf("创建时间序列集合：%s", err)
-		}
-	}
-}
-
-// 创建索引
-func (c *ApiClient) mongoCreateIndexes() {
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"trace_id", 1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"request_time", -1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"request_method", 1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"response_status_code", 1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"response_time", -1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"system_host_name", 1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"system_inside_ip", 1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"go_version", -1},
-	}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{Keys: bson.D{
-		{"sdk_version", -1},
-	}}))
-}
-
-// 模型结构体
-type apiMongolLog struct {
-	LogId                 primitive.ObjectID `json:"log_id,omitempty" bson:"_id,omitempty"`                                      //【记录】编号
-	TraceId               string             `json:"trace_id,omitempty" bson:"trace_id,omitempty"`                               //【系统】跟踪编号
-	RequestTime           primitive.DateTime `json:"request_time,omitempty" bson:"request_time,omitempty"`                       //【请求】时间
-	RequestUri            string             `json:"request_uri,omitempty" bson:"request_uri,omitempty"`                         //【请求】链接
-	RequestUrl            string             `json:"request_url,omitempty" bson:"request_url,omitempty"`                         //【请求】链接
-	RequestApi            string             `json:"request_api,omitempty" bson:"request_api,omitempty"`                         //【请求】接口
-	RequestMethod         string             `json:"request_method,omitempty" bson:"request_method,omitempty"`                   //【请求】方式
-	RequestParams         interface{}        `json:"request_params,omitempty" bson:"request_params,omitempty"`                   //【请求】参数
-	RequestHeader         interface{}        `json:"request_header,omitempty" bson:"request_header,omitempty"`                   //【请求】头部
-	ResponseHeader        interface{}        `json:"response_header,omitempty" bson:"response_header,omitempty"`                 //【返回】头部
-	ResponseStatusCode    int                `json:"response_status_code,omitempty" bson:"response_status_code,omitempty"`       //【返回】状态码
-	ResponseBody          interface{}        `json:"response_body,omitempty" bson:"response_body,omitempty"`                     //【返回】内容
-	ResponseContentLength int64              `json:"response_content_length,omitempty" bson:"response_content_length,omitempty"` //【返回】大小
-	ResponseTime          primitive.DateTime `json:"response_time,omitempty" bson:"response_time,omitempty"`                     //【返回】时间
-	SystemHostName        string             `json:"system_host_name,omitempty" bson:"system_host_name,omitempty"`               //【系统】主机名
-	SystemInsideIp        string             `json:"system_inside_ip,omitempty" bson:"system_inside_ip,omitempty"`               //【系统】内网ip
-	GoVersion             string             `json:"go_version,omitempty" bson:"go_version,omitempty"`                           //【程序】Go版本
-	SdkVersion            string             `json:"sdk_version,omitempty" bson:"sdk_version,omitempty"`                         //【程序】Sdk版本
-}
-
-// 记录日志
-func (c *ApiClient) mongoRecord(ctx context.Context, mongoLog apiMongolLog) (err error) {
-
-	mongoLog.SystemHostName = c.mongoConfig.hostname
-	mongoLog.SystemInsideIp = c.mongoConfig.insideIp
-	mongoLog.GoVersion = c.mongoConfig.goVersion
-
-	mongoLog.TraceId = gotrace_id.GetTraceIdContext(ctx)
-
-	mongoLog.LogId = primitive.NewObjectID()
-
-	_, err = c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).InsertOne(mongoLog)
-	if err != nil {
-		c.zapLog.WithLogger().Sugar().Errorf("[golog.api.mongoRecord]：%s", err)
-	}
-
-	return err
-}
-
-// MongoQuery 查询
-func (c *ApiClient) MongoQuery() *dorm.MongoClient {
-	return c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName)
-}
-
-// MongoMiddleware 中间件
-func (c *ApiClient) MongoMiddleware(ctx context.Context, request gorequest.Response, sdkVersion string) {
-	data := apiMongolLog{
-		RequestTime:           primitive.NewDateTimeFromTime(request.RequestTime),  //【请求】时间
-		RequestUri:            request.RequestUri,                                  //【请求】链接
-		RequestUrl:            gourl.UriParse(request.RequestUri).Url,              //【请求】链接
-		RequestApi:            gourl.UriParse(request.RequestUri).Path,             //【请求】接口
-		RequestMethod:         request.RequestMethod,                               //【请求】方式
-		RequestParams:         request.RequestParams,                               //【请求】参数
-		RequestHeader:         request.RequestHeader,                               //【请求】头部
-		ResponseHeader:        request.ResponseHeader,                              //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                          //【返回】状态码
-		ResponseContentLength: request.ResponseContentLength,                       //【返回】大小
-		ResponseTime:          primitive.NewDateTimeFromTime(request.ResponseTime), //【返回】时间
-		SdkVersion:            sdkVersion,                                          //【程序】Sdk版本
-	}
-	if request.ResponseHeader.Get("Content-Type") == "image/jpeg" || request.ResponseHeader.Get("Content-Type") == "image/png" || request.ResponseHeader.Get("Content-Type") == "image/jpg" {
-		c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddleware.type]：%s %s", data.RequestUri, request.ResponseHeader.Get("Content-Type"))
-	} else {
-		if len(dorm.JsonDecodeNoError(request.ResponseBody)) > 0 {
-			data.ResponseBody = dorm.JsonDecodeNoError(request.ResponseBody) //【返回】内容
-		} else {
-			c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddleware.len]：%s %s", data.RequestUri, request.ResponseBody)
-		}
-	}
-	err := c.mongoRecord(ctx, data)
-	if err != nil {
-		c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.MongoMiddleware]：%s", err.Error())
-	}
-}
-
-// MongoMiddlewareXml 中间件
-func (c *ApiClient) MongoMiddlewareXml(ctx context.Context, request gorequest.Response, sdkVersion string) {
-	data := apiMongolLog{
-		RequestTime:           primitive.NewDateTimeFromTime(request.RequestTime),  //【请求】时间
-		RequestUri:            request.RequestUri,                                  //【请求】链接
-		RequestUrl:            gourl.UriParse(request.RequestUri).Url,              //【请求】链接
-		RequestApi:            gourl.UriParse(request.RequestUri).Path,             //【请求】接口
-		RequestMethod:         request.RequestMethod,                               //【请求】方式
-		RequestParams:         request.RequestParams,                               //【请求】参数
-		RequestHeader:         request.RequestHeader,                               //【请求】头部
-		ResponseHeader:        request.ResponseHeader,                              //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                          //【返回】状态码
-		ResponseContentLength: request.ResponseContentLength,                       //【返回】大小
-		ResponseTime:          primitive.NewDateTimeFromTime(request.ResponseTime), //【返回】时间
-		SdkVersion:            sdkVersion,                                          //【程序】Sdk版本
-	}
-	if request.ResponseHeader.Get("Content-Type") == "image/jpeg" || request.ResponseHeader.Get("Content-Type") == "image/png" || request.ResponseHeader.Get("Content-Type") == "image/jpg" {
-		c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareXml.type]：%s %s", data.RequestUri, request.ResponseHeader.Get("Content-Type"))
-	} else {
-		if len(dorm.XmlDecodeNoError(request.ResponseBody)) > 0 {
-			data.ResponseBody = dorm.XmlDecodeNoError(request.ResponseBody) //【返回】内容
-		} else {
-			c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareXml]：%s %s", data.RequestUri, request.ResponseBody)
-		}
-	}
-	err := c.mongoRecord(ctx, data)
-	if err != nil {
-		c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.MongoMiddlewareXml]：%s", err.Error())
-	}
-}
-
-// MongoMiddlewareCustom 中间件
-func (c *ApiClient) MongoMiddlewareCustom(ctx context.Context, api string, request gorequest.Response, sdkVersion string) {
-	data := apiMongolLog{
-		RequestTime:           primitive.NewDateTimeFromTime(request.RequestTime),  //【请求】时间
-		RequestUri:            request.RequestUri,                                  //【请求】链接
-		RequestUrl:            gourl.UriParse(request.RequestUri).Url,              //【请求】链接
-		RequestApi:            api,                                                 //【请求】接口
-		RequestMethod:         request.RequestMethod,                               //【请求】方式
-		RequestParams:         request.RequestParams,                               //【请求】参数
-		RequestHeader:         request.RequestHeader,                               //【请求】头部
-		ResponseHeader:        request.ResponseHeader,                              //【返回】头部
-		ResponseStatusCode:    request.ResponseStatusCode,                          //【返回】状态码
-		ResponseContentLength: request.ResponseContentLength,                       //【返回】大小
-		ResponseTime:          primitive.NewDateTimeFromTime(request.ResponseTime), //【返回】时间
-		SdkVersion:            sdkVersion,                                          //【程序】Sdk版本
-	}
-	if request.ResponseHeader.Get("Content-Type") == "image/jpeg" || request.ResponseHeader.Get("Content-Type") == "image/png" || request.ResponseHeader.Get("Content-Type") == "image/jpg" {
-		c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareCustom.type]：%s %s", data.RequestUri, request.ResponseHeader.Get("Content-Type"))
-	} else {
-		if len(dorm.JsonDecodeNoError(request.ResponseBody)) > 0 {
-			data.ResponseBody = dorm.JsonDecodeNoError(request.ResponseBody) //【返回】内容
-		} else {
-			c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareCustom]：%s %s", data.RequestUri, request.ResponseBody)
-		}
-	}
-	err := c.mongoRecord(ctx, data)
-	if err != nil {
-		c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.MongoMiddlewareCustom]：%s", err.Error())
-	}
-}

api_slog.go

@@ -0,0 +1,21 @@
+package golog
+
+import (
+	"context"
+)
+
+// ApiSLog 接口日志
+type ApiSLog struct {
+	slog struct {
+		status bool  // 状态
+		client *SLog // 日志服务
+	}
+}
+
+// ApiSLogFun 接口日志驱动
+type ApiSLogFun func() *ApiSLog
+
+func NewApiSlog(ctx context.Context) *ApiSLog {
+	sl := &ApiSLog{}
+	return sl
+}

api_slog_config.go

@@ -0,0 +1,20 @@
+package golog
+
+// ConfigSLogClientFun 日志配置
+func (al *ApiSLog) ConfigSLogClientFun(sLogFun SLogFun) {
+	sLog := sLogFun()
+	if sLog != nil {
+		al.slog.client = sLog
+		al.slog.status = true
+	}
+}
+
+// ConfigSLogResultClientFun 日志配置然后返回
+func (al *ApiSLog) ConfigSLogResultClientFun(sLogFun SLogFun) *ApiSLog {
+	sLog := sLogFun()
+	if sLog != nil {
+		al.slog.client = sLog
+		al.slog.status = true
+	}
+	return al
+}

api_slog_record.go

@@ -0,0 +1,125 @@
+package golog
+
+import (
+	"context"
+	"go.dtapp.net/gojson"
+	"go.dtapp.net/gorequest"
+	"go.dtapp.net/gotrace_id"
+	"go.dtapp.net/gourl"
+	"time"
+)
+
+// 结构体
+type apiSLog struct {
+	TraceID            string                 `json:"trace_id,omitempty"`
+	RequestTime        time.Time              `json:"request_time,omitempty"`
+	RequestUri         string                 `json:"request_uri,omitempty"`
+	RequestUrl         string                 `json:"request_url,omitempty"`
+	RequestApi         string                 `json:"request_api,omitempty"`
+	RequestMethod      string                 `json:"request_method,omitempty"`
+	RequestParams      map[string]interface{} `json:"request_params,omitempty"`
+	RequestHeader      map[string]string      `json:"request_header,omitempty"`
+	ResponseHeader     map[string][]string    `json:"response_header,omitempty"`
+	ResponseStatusCode int                    `json:"response_status_code,omitempty"`
+	ResponseBody       map[string]interface{} `json:"response_body,omitempty"`
+	ResponseTime       time.Time              `json:"response_time,omitempty,omitempty"`
+}
+
+// Middleware 中间件
+func (al *ApiSLog) Middleware(ctx context.Context, request gorequest.Response) {
+	data := apiSLog{
+		TraceID:            gotrace_id.GetTraceIdContext(ctx),
+		RequestTime:        request.RequestTime,
+		RequestUri:         request.RequestUri,
+		RequestUrl:         gourl.UriParse(request.RequestUri).Url,
+		RequestApi:         gourl.UriParse(request.RequestUri).Path,
+		RequestMethod:      request.RequestMethod,
+		RequestParams:      request.RequestParams,
+		RequestHeader:      request.RequestHeader,
+		ResponseHeader:     request.ResponseHeader,
+		ResponseStatusCode: request.ResponseStatusCode,
+		ResponseBody:       gojson.JsonDecodeNoError(string(request.ResponseBody)),
+		ResponseTime:       request.ResponseTime,
+	}
+	if al.slog.status {
+		al.slog.client.WithTraceId(ctx).Info("Middleware",
+			"request_time", data.RequestTime,
+			"request_uri", data.RequestUri,
+			"request_url", data.RequestUrl,
+			"request_api", data.RequestApi,
+			"request_method", data.RequestMethod,
+			"request_params", data.RequestParams,
+			"request_header", data.RequestHeader,
+			"response_header", data.ResponseHeader,
+			"response_status_code", data.ResponseStatusCode,
+			"response_body", data.ResponseBody,
+			"response_time", data.ResponseTime,
+		)
+	}
+}
+
+// MiddlewareXml 中间件
+func (al *ApiSLog) MiddlewareXml(ctx context.Context, request gorequest.Response) {
+	data := apiSLog{
+		TraceID:            gotrace_id.GetTraceIdContext(ctx),
+		RequestTime:        request.RequestTime,
+		RequestUri:         request.RequestUri,
+		RequestUrl:         gourl.UriParse(request.RequestUri).Url,
+		RequestApi:         gourl.UriParse(request.RequestUri).Path,
+		RequestMethod:      request.RequestMethod,
+		RequestParams:      request.RequestParams,
+		RequestHeader:      request.RequestHeader,
+		ResponseHeader:     request.ResponseHeader,
+		ResponseStatusCode: request.ResponseStatusCode,
+		ResponseBody:       gojson.XmlDecodeNoError(request.ResponseBody),
+		ResponseTime:       request.ResponseTime,
+	}
+	if al.slog.status {
+		al.slog.client.WithTraceId(ctx).Info("MiddlewareXml",
+			"request_time", data.RequestTime,
+			"request_uri", data.RequestUri,
+			"request_url", data.RequestUrl,
+			"request_api", data.RequestApi,
+			"request_method", data.RequestMethod,
+			"request_params", data.RequestParams,
+			"request_header", data.RequestHeader,
+			"response_header", data.ResponseHeader,
+			"response_status_code", data.ResponseStatusCode,
+			"response_body", data.ResponseBody,
+			"response_time", data.ResponseTime,
+		)
+	}
+}
+
+// MiddlewareCustom 中间件
+func (al *ApiSLog) MiddlewareCustom(ctx context.Context, api string, request gorequest.Response) {
+	data := apiSLog{
+		TraceID:            gotrace_id.GetTraceIdContext(ctx),
+		RequestTime:        request.RequestTime,
+		RequestUri:         request.RequestUri,
+		RequestUrl:         gourl.UriParse(request.RequestUri).Url,
+		RequestApi:         api,
+		RequestMethod:      request.RequestMethod,
+		RequestParams:      request.RequestParams,
+		RequestHeader:      request.RequestHeader,
+		ResponseHeader:     request.ResponseHeader,
+		ResponseStatusCode: request.ResponseStatusCode,
+		ResponseBody:       gojson.JsonDecodeNoError(string(request.ResponseBody)),
+		ResponseTime:       request.ResponseTime,
+	}
+	if al.slog.status {
+		al.slog.client.WithTraceId(ctx).Info("MiddlewareCustom",
+			"request_time", data.RequestTime,
+			"request_uri", data.RequestUri,
+			"request_url", data.RequestUrl,
+			"request_api", data.RequestApi,
+			"request_method", data.RequestMethod,
+			"request_params", data.RequestParams,
+			"request_header", data.RequestHeader,
+			"response_header", data.ResponseHeader,
+			"response_status_code", data.ResponseStatusCode,
+			"response_body", data.ResponseBody,
+			"response_time", data.ResponseTime,
+		)
+	}
+}

config.go

@@ -0,0 +1,47 @@
+package golog
+
+import (
+	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/host"
+)
+
+type systemResult struct {
+	SystemHostname      string  // 主机名
+	SystemOs            string  // 系统类型
+	SystemVersion       string  // 系统版本
+	SystemKernel        string  // 系统内核
+	SystemKernelVersion string  // 系统内核版本
+	SystemUpTime        uint64  // 系统运行时间
+	SystemBootTime      uint64  // 系统开机时间
+	CpuCores            int     // CPU核数
+	CpuModelName        string  // CPU型号名称
+	CpuMhz              float64 // CPU兆赫
+}
+
+func getSystem() (result systemResult) {
+
+	hInfo, _ := host.Info()
+
+	result.SystemHostname = hInfo.Hostname
+	result.SystemOs = hInfo.OS
+	result.SystemVersion = hInfo.PlatformVersion
+	result.SystemKernel = hInfo.KernelArch
+	result.SystemKernelVersion = hInfo.KernelVersion
+	result.SystemUpTime = hInfo.Uptime
+	if hInfo.BootTime != 0 {
+		result.SystemBootTime = hInfo.BootTime
+	}
+
+	hCpu, _ := cpu.Times(true)
+
+	result.CpuCores = len(hCpu)
+
+	cInfo, _ := cpu.Info()
+
+	if len(cInfo) > 0 {
+		result.CpuModelName = cInfo[0].ModelName
+		result.CpuMhz = cInfo[0].Mhz
+	}
+
+	return result
+}

gin.go

@@ -1,259 +0,0 @@
-package golog
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"github.com/gin-gonic/gin"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goip"
-	"go.dtapp.net/gorequest"
-	"go.dtapp.net/gotime"
-	"go.dtapp.net/gotrace_id"
-	"io/ioutil"
-	"net"
-	"os"
-	"runtime"
-)
-
-// GinClient 框架
-type GinClient struct {
-	gormClient  *dorm.GormClient  // 数据库驱动
-	mongoClient *dorm.MongoClient // 数据库驱动
-	ipService   *goip.Client      // ip服务
-	zapLog      *ZapLog           // 日志服务
-	logDebug    bool              // 日志开关
-	gormConfig  struct {
-		tableName string // 表名
-		insideIp  string // 内网ip
-		hostname  string // 主机名
-		goVersion string // go版本
-	}
-	mongoConfig struct {
-		databaseName   string // 库名
-		collectionName string // 表名
-		insideIp       string // 内网ip
-		hostname       string // 主机名
-		goVersion      string // go版本
-	}
-	log struct {
-		gorm  bool // 日志开关
-		mongo bool // 日志开关
-	}
-}
-
-// client 数据库服务
-// string 表名
-type ginGormClientFun func() (*dorm.GormClient, string)
-
-// client 数据库服务
-// string 库名
-// string 表名
-type ginMongoClientFun func() (*dorm.MongoClient, string, string)
-
-// GinClientConfig 框架实例配置
-type GinClientConfig struct {
-	IpService      *goip.Client      // ip服务
-	GormClientFun  ginGormClientFun  // 日志配置
-	MongoClientFun apiMongoClientFun // 日志配置
-	Debug          bool              // 日志开关
-	ZapLog         *ZapLog           // 日志服务
-}
-
-// NewGinClient 创建框架实例化
-// client 数据库服务
-// tableName 表名
-// ipService ip服务
-func NewGinClient(config *GinClientConfig) (*GinClient, error) {
-
-	var ctx = context.Background()
-
-	c := &GinClient{}
-
-	c.zapLog = config.ZapLog
-
-	c.logDebug = config.Debug
-
-	gormClient, gormTableName := config.GormClientFun()
-	mongoClient, mongoDatabaseName, mongoCollectionName := config.MongoClientFun()
-
-	if (gormClient == nil || gormClient.Db == nil) || (mongoClient == nil || mongoClient.Db == nil) {
-		return nil, errors.New("没有设置驱动")
-	}
-
-	hostname, _ := os.Hostname()
-
-	if gormClient != nil || gormClient.Db != nil {
-
-		c.gormClient = gormClient
-
-		if gormTableName == "" {
-			return nil, errors.New("没有设置表名")
-		}
-		c.gormConfig.tableName = gormTableName
-
-		c.ipService = config.IpService
-
-		err := c.gormAutoMigrate()
-		if err != nil {
-			return nil, errors.New("创建表失败：" + err.Error())
-		}
-
-		c.gormConfig.hostname = hostname
-		c.gormConfig.insideIp = goip.GetInsideIp(ctx)
-		c.gormConfig.goVersion = runtime.Version()
-
-		c.log.gorm = true
-
-	}
-
-	if mongoClient != nil || mongoClient.Db != nil {
-
-		c.mongoClient = mongoClient
-
-		if mongoDatabaseName == "" {
-			return nil, errors.New("没有设置库名")
-		}
-		c.mongoConfig.databaseName = mongoDatabaseName
-
-		if mongoCollectionName == "" {
-			return nil, errors.New("没有设置表名")
-		}
-		c.mongoConfig.collectionName = mongoCollectionName
-
-		c.ipService = config.IpService
-
-		c.mongoConfig.hostname = hostname
-		c.mongoConfig.insideIp = goip.GetInsideIp(ctx)
-		c.mongoConfig.goVersion = runtime.Version()
-
-		c.log.mongo = true
-
-		// 创建时间序列集合
-		c.mongoCreateCollection()
-
-		// 创建索引
-		c.mongoCreateIndexes()
-
-	}
-
-	return c, nil
-}
-
-type bodyLogWriter struct {
-	gin.ResponseWriter
-	body *bytes.Buffer
-}
-
-func (w bodyLogWriter) Write(b []byte) (int, error) {
-	w.body.Write(b)
-	return w.ResponseWriter.Write(b)
-}
-
-func (w bodyLogWriter) WriteString(s string) (int, error) {
-	w.body.WriteString(s)
-	return w.ResponseWriter.WriteString(s)
-}
-
-func (c *GinClient) jsonUnmarshal(data string) (result interface{}) {
-	_ = json.Unmarshal([]byte(data), &result)
-	return
-}
-
-// Middleware 中间件
-func (c *GinClient) Middleware() gin.HandlerFunc {
-	return func(ginCtx *gin.Context) {
-
-		// 开始时间
-		startTime := gotime.Current().TimestampWithMillisecond()
-		requestTime := gotime.Current().Time
-
-		// 获取
-		data, _ := ioutil.ReadAll(ginCtx.Request.Body)
-
-		// 复用
-		ginCtx.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
-
-		blw := &bodyLogWriter{body: bytes.NewBufferString(""), ResponseWriter: ginCtx.Writer}
-		ginCtx.Writer = blw
-
-		// 处理请求
-		ginCtx.Next()
-
-		// 响应
-		responseCode := ginCtx.Writer.Status()
-		responseBody := blw.body.String()
-
-		//结束时间
-		endTime := gotime.Current().TimestampWithMillisecond()
-
-		go func() {
-
-			var dataJson = true
-
-			// 解析请求内容
-			var jsonBody map[string]interface{}
-
-			// 判断是否有内容
-			if len(data) > 0 {
-				err := json.Unmarshal(data, &jsonBody)
-				if err != nil {
-					dataJson = false
-				}
-			}
-
-			clientIp := gorequest.ClientIp(ginCtx.Request)
-
-			requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp := "", "", "", "", ""
-			if c.ipService != nil {
-				if net.ParseIP(clientIp).To4() != nil {
-					// IPv4
-					_, info := c.ipService.Ipv4(clientIp)
-					requestClientIpCountry = info.Country
-					requestClientIpRegion = info.Region
-					requestClientIpProvince = info.Province
-					requestClientIpCity = info.City
-					requestClientIpIsp = info.ISP
-				} else if net.ParseIP(clientIp).To16() != nil {
-					// IPv6
-					info := c.ipService.Ipv6(clientIp)
-					requestClientIpCountry = info.Country
-					requestClientIpProvince = info.Province
-					requestClientIpCity = info.City
-				}
-			}
-
-			var traceId = gotrace_id.GetGinTraceId(ginCtx)
-
-			// 记录
-			if c.log.gorm {
-				if dataJson {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.Middleware]准备使用{gormRecordJson}保存数据：%s", data)
-					}
-					c.gormRecordJson(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				} else {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.Middleware]准备使用{gormRecordXml}保存数据：%s", data)
-					}
-					c.gormRecordXml(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				}
-			}
-			// 记录
-			if c.log.mongo {
-				if dataJson {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.Middleware]准备使用{mongoRecordJson}保存数据：%s", data)
-					}
-					c.mongoRecordJson(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				} else {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.Middleware]准备使用{mongoRecordXml}保存数据：%s", data)
-					}
-					c.mongoRecordXml(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				}
-			}
-		}()
-	}
-}

gin_gorm.go

@@ -3,266 +3,125 @@ package golog
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"errors"
 	"github.com/gin-gonic/gin"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goip"
+	"go.dtapp.net/gojson"
 	"go.dtapp.net/gorequest"
 	"go.dtapp.net/gotime"
-	"go.dtapp.net/gotrace_id"
-	"go.dtapp.net/gourl"
-	"gorm.io/datatypes"
 	"gorm.io/gorm"
 	"io/ioutil"
-	"net"
-	"os"
-	"runtime"
-	"time"
 )
 
-// GinGormClientConfig 框架实例配置
-type GinGormClientConfig struct {
-	IpService     *goip.Client     // ip服务
-	GormClientFun ginGormClientFun // 日志配置
-	Debug         bool             // 日志开关
-	ZapLog        *ZapLog          // 日志服务
-}
-
-// NewGinGormClient 创建框架实例化
-// client 数据库服务
-// tableName 表名
-// ipService ip服务
-func NewGinGormClient(config *GinGormClientConfig) (*GinClient, error) {
-
-	var ctx = context.Background()
-
-	c := &GinClient{}
-
-	c.zapLog = config.ZapLog
-
-	c.logDebug = config.Debug
-
-	client, tableName := config.GormClientFun()
-
-	if client == nil || client.Db == nil {
-		return nil, errors.New("没有设置驱动")
+// GinGorm 框架日志
+type GinGorm struct {
+	gormClient *gorm.DB // 数据库驱动
+	config     struct {
+		systemHostname      string  // 主机名
+		systemOs            string  // 系统类型
+		systemVersion       string  // 系统版本
+		systemKernel        string  // 系统内核
+		systemKernelVersion string  // 系统内核版本
+		systemBootTime      uint64  // 系统开机时间
+		cpuCores            int     // CPU核数
+		cpuModelName        string  // CPU型号名称
+		cpuMhz              float64 // CPU兆赫
+		systemInsideIp      string  // 内网ip
+		systemOutsideIp     string  // 外网ip
+		goVersion           string  // go版本
+		sdkVersion          string  // sdk版本
+	}
+	gormConfig struct {
+		stats     bool   // 状态
+		tableName string // 表名
 	}
+}
 
-	c.gormClient = client
+// GinGormFun *GinGorm 框架日志驱动
+type GinGormFun func() *GinGorm
 
-	if tableName == "" {
-		return nil, errors.New("没有设置表名")
-	}
-	c.gormConfig.tableName = tableName
+// NewGinGorm 创建框架实例化
+func NewGinGorm(ctx context.Context, systemOutsideIp string, gormClient *gorm.DB, gormTableName string) (*GinGorm, error) {
 
-	c.ipService = config.IpService
+	gg := &GinGorm{}
 
-	err := c.gormAutoMigrate()
-	if err != nil {
-		return nil, errors.New("创建表失败：" + err.Error())
+	// 配置信息
+	if systemOutsideIp == "" {
+		return nil, errors.New("没有设置外网IP")
 	}
+	gg.setConfig(ctx, systemOutsideIp)
 
-	hostname, _ := os.Hostname()
+	if gormClient == nil {
+		gg.gormConfig.stats = false
+	} else {
 
-	c.gormConfig.hostname = hostname
-	c.gormConfig.insideIp = goip.GetInsideIp(ctx)
-	c.gormConfig.goVersion = runtime.Version()
+		gg.gormClient = gormClient
 
-	c.log.gorm = true
+		if gormTableName == "" {
+			return nil, errors.New("没有设置表名")
+		} else {
+			gg.gormConfig.tableName = gormTableName
+		}
 
-	return c, nil
-}
+		// 创建模型
+		gg.gormAutoMigrate(ctx)
 
-// 创建模型
-func (c *GinClient) gormAutoMigrate() (err error) {
-	err = c.gormClient.Db.Table(c.gormConfig.tableName).AutoMigrate(&ginPostgresqlLog{})
-	if err != nil {
-		c.zapLog.WithLogger().Sugar().Infof("[golog.gin.gormAutoMigrate]：%s", err)
+		gg.gormConfig.stats = true
 	}
-	return err
-}
 
-// 模型结构体
-type ginPostgresqlLog struct {
-	LogId             uint           `gorm:"primaryKey;comment:【记录】编号" json:"log_id,omitempty"`                 //【记录】编号
-	TraceId           string         `gorm:"index;comment:【系统】跟踪编号" json:"trace_id,omitempty"`                  //【系统】跟踪编号
-	RequestTime       time.Time      `gorm:"index;comment:【请求】时间" json:"request_time,omitempty"`                //【请求】时间
-	RequestUri        string         `gorm:"comment:【请求】请求链接 域名+路径+参数" json:"request_uri,omitempty"`            //【请求】请求链接 域名+路径+参数
-	RequestUrl        string         `gorm:"comment:【请求】请求链接 域名+路径" json:"request_url,omitempty"`               //【请求】请求链接 域名+路径
-	RequestApi        string         `gorm:"index;comment:【请求】请求接口 路径" json:"request_api,omitempty"`            //【请求】请求接口 路径
-	RequestMethod     string         `gorm:"index;comment:【请求】请求方式" json:"request_method,omitempty"`            //【请求】请求方式
-	RequestProto      string         `gorm:"comment:【请求】请求协议" json:"request_proto,omitempty"`                   //【请求】请求协议
-	RequestUa         string         `gorm:"comment:【请求】请求UA" json:"request_ua,omitempty"`                      //【请求】请求UA
-	RequestReferer    string         `gorm:"comment:【请求】请求referer" json:"request_referer,omitempty"`            //【请求】请求referer
-	RequestBody       datatypes.JSON `gorm:"type:jsonb;comment:【请求】请求主体" json:"request_body,omitempty"`         //【请求】请求主体
-	RequestContent    string         `gorm:"comment:【请求】请求内容" json:"request_content,omitempty"`                 //【请求】请求内容
-	RequestUrlQuery   datatypes.JSON `gorm:"type:jsonb;comment:【请求】请求URL参数" json:"request_url_query,omitempty"` //【请求】请求URL参数
-	RequestIp         string         `gorm:"index;comment:【请求】请求客户端Ip" json:"request_ip,omitempty"`             //【请求】请求客户端Ip
-	RequestIpCountry  string         `gorm:"index;comment:【请求】请求客户端城市" json:"request_ip_country,omitempty"`     //【请求】请求客户端城市
-	RequestIpRegion   string         `gorm:"index;comment:【请求】请求客户端区域" json:"request_ip_region,omitempty"`      //【请求】请求客户端区域
-	RequestIpProvince string         `gorm:"index;comment:【请求】请求客户端省份" json:"request_ip_province,omitempty"`    //【请求】请求客户端省份
-	RequestIpCity     string         `gorm:"index;comment:【请求】请求客户端城市" json:"request_ip_city,omitempty"`        //【请求】请求客户端城市
-	RequestIpIsp      string         `gorm:"index;comment:【请求】请求客户端运营商" json:"request_ip_isp,omitempty"`        //【请求】请求客户端运营商
-	RequestHeader     datatypes.JSON `gorm:"type:jsonb;comment:【请求】请求头" json:"request_header,omitempty"`        //【请求】请求头
-	ResponseTime      time.Time      `gorm:"index;comment:【返回】时间" json:"response_time,omitempty"`               //【返回】时间
-	ResponseCode      int            `gorm:"index;comment:【返回】状态码" json:"response_code,omitempty"`              //【返回】状态码
-	ResponseMsg       string         `gorm:"comment:【返回】描述" json:"response_msg,omitempty"`                      //【返回】描述
-	ResponseData      datatypes.JSON `gorm:"type:jsonb;comment:【返回】数据" json:"response_data,omitempty"`          //【返回】数据
-	ResponseContent   string         `gorm:"comment:【返回】内容" json:"response_content,omitempty"`                  //【返回】内容
-	CostTime          int64          `gorm:"comment:【系统】花费时间" json:"cost_time,omitempty"`                       //【系统】花费时间
-	SystemHostName    string         `gorm:"index;comment:【系统】主机名" json:"system_host_name,omitempty"`           //【系统】主机名
-	SystemInsideIp    string         `gorm:"index;comment:【系统】内网ip" json:"system_inside_ip,omitempty"`          //【系统】内网ip
-	GoVersion         string         `gorm:"index;comment:【程序】Go版本" json:"go_version,omitempty"`                //【程序】Go版本
-	SdkVersion        string         `gorm:"index;comment:【程序】Sdk版本" json:"sdk_version,omitempty"`              //【程序】Sdk版本
+	return gg, nil
 }
 
-// gormRecord 记录日志
-func (c *GinClient) gormRecord(postgresqlLog ginPostgresqlLog) (err error) {
-
-	postgresqlLog.SystemHostName = c.gormConfig.hostname
-	postgresqlLog.SystemInsideIp = c.gormConfig.insideIp
-	postgresqlLog.GoVersion = c.gormConfig.goVersion
-
-	postgresqlLog.SdkVersion = Version
-
-	err = c.gormClient.Db.Table(c.gormConfig.tableName).Create(&postgresqlLog).Error
-	if err != nil {
-		c.zapLog.WithLogger().Sugar().Errorf("[golog.gin.gormRecord]：%s", err)
-	}
-
-	return
+type bodyGormWriter struct {
+	gin.ResponseWriter
+	body *bytes.Buffer
 }
 
-func (c *GinClient) gormRecordJson(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody string, responseCode int, responseBody string, startTime, endTime int64, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp string) {
-
-	if c.logDebug {
-		c.zapLog.WithLogger().Sugar().Infof("[golog.gin.gormRecordJson]收到保存数据要求：%s", c.gormConfig.tableName)
-	}
-
-	data := ginPostgresqlLog{
-		TraceId:           traceId,                                                            //【系统】跟踪编号
-		RequestTime:       requestTime,                                                        //【请求】时间
-		RequestUrl:        ginCtx.Request.RequestURI,                                          //【请求】请求链接
-		RequestApi:        gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI),       //【请求】请求接口
-		RequestMethod:     ginCtx.Request.Method,                                              //【请求】请求方式
-		RequestProto:      ginCtx.Request.Proto,                                               //【请求】请求协议
-		RequestUa:         ginCtx.Request.UserAgent(),                                         //【请求】请求UA
-		RequestReferer:    ginCtx.Request.Referer(),                                           //【请求】请求referer
-		RequestUrlQuery:   datatypes.JSON(dorm.JsonEncodeNoError(ginCtx.Request.URL.Query())), //【请求】请求URL参数
-		RequestIp:         clientIp,                                                           //【请求】请求客户端Ip
-		RequestIpCountry:  requestClientIpCountry,                                             //【请求】请求客户端城市
-		RequestIpRegion:   requestClientIpRegion,                                              //【请求】请求客户端区域
-		RequestIpProvince: requestClientIpProvince,                                            //【请求】请求客户端省份
-		RequestIpCity:     requestClientIpCity,                                                //【请求】请求客户端城市
-		RequestIpIsp:      requestClientIpIsp,                                                 //【请求】请求客户端运营商
-		RequestHeader:     datatypes.JSON(dorm.JsonEncodeNoError(ginCtx.Request.Header)),      //【请求】请求头
-		ResponseTime:      gotime.Current().Time,                                              //【返回】时间
-		ResponseCode:      responseCode,                                                       //【返回】状态码
-		ResponseData:      datatypes.JSON(responseBody),                                       //【返回】数据
-		ResponseContent:   responseBody,                                                       //【返回】内容
-		CostTime:          endTime - startTime,                                                //【系统】花费时间
-	}
-	if ginCtx.Request.TLS == nil {
-		data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	} else {
-		data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	}
-
-	if len(requestBody) > 0 {
-		data.RequestBody = datatypes.JSON(requestBody)            //【请求】请求主体
-		data.RequestContent = dorm.JsonEncodeNoError(requestBody) //【请求】请求内容
-	} else {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordJson.len]：%s %s", data.RequestUri, requestBody)
-	}
-
-	err := c.gormRecord(data)
-	if err != nil {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordJson]：%s", err)
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordJson.string]：%s", requestBody)
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordJson.value]：%+v", requestBody)
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordJson.JsonEncodeNoError.string]：%s", dorm.JsonEncodeNoError(requestBody))
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordJson.JsonEncodeNoError.value]：%+v", dorm.JsonEncodeNoError(requestBody))
-	}
+func (w bodyGormWriter) Write(b []byte) (int, error) {
+	w.body.Write(b)
+	return w.ResponseWriter.Write(b)
 }
 
-func (c *GinClient) gormRecordXml(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody string, responseCode int, responseBody string, startTime, endTime int64, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp string) {
-
-	if c.logDebug {
-		c.zapLog.WithLogger().Sugar().Infof("[golog.gin.gormRecordXml]收到保存数据要求：%s", c.gormConfig.tableName)
-	}
-
-	data := ginPostgresqlLog{
-		TraceId:           traceId,                                                            //【系统】跟踪编号
-		RequestTime:       requestTime,                                                        //【请求】时间
-		RequestUrl:        ginCtx.Request.RequestURI,                                          //【请求】请求链接
-		RequestApi:        gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI),       //【请求】请求接口
-		RequestMethod:     ginCtx.Request.Method,                                              //【请求】请求方式
-		RequestProto:      ginCtx.Request.Proto,                                               //【请求】请求协议
-		RequestUa:         ginCtx.Request.UserAgent(),                                         //【请求】请求UA
-		RequestReferer:    ginCtx.Request.Referer(),                                           //【请求】请求referer
-		RequestUrlQuery:   datatypes.JSON(dorm.JsonEncodeNoError(ginCtx.Request.URL.Query())), //【请求】请求URL参数
-		RequestIp:         clientIp,                                                           //【请求】请求客户端Ip
-		RequestIpCountry:  requestClientIpCountry,                                             //【请求】请求客户端城市
-		RequestIpRegion:   requestClientIpRegion,                                              //【请求】请求客户端区域
-		RequestIpProvince: requestClientIpProvince,                                            //【请求】请求客户端省份
-		RequestIpCity:     requestClientIpCity,                                                //【请求】请求客户端城市
-		RequestIpIsp:      requestClientIpIsp,                                                 //【请求】请求客户端运营商
-		RequestHeader:     datatypes.JSON(dorm.JsonEncodeNoError(ginCtx.Request.Header)),      //【请求】请求头
-		ResponseTime:      gotime.Current().Time,                                              //【返回】时间
-		ResponseCode:      responseCode,                                                       //【返回】状态码
-		ResponseData:      datatypes.JSON(responseBody),                                       //【返回】数据
-		ResponseContent:   responseBody,                                                       //【返回】内容
-		CostTime:          endTime - startTime,                                                //【系统】花费时间
-	}
-	if ginCtx.Request.TLS == nil {
-		data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	} else {
-		data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	}
-
-	if len(requestBody) > 0 {
-		data.RequestContent = dorm.XmlEncodeNoError(dorm.XmlDecodeNoError([]byte(requestBody))) //【请求】请求内容
-	} else {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordXml.len]：%s %s", data.RequestUri, requestBody)
-	}
-
-	err := c.gormRecord(data)
-	if err != nil {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml]：%s", err)
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.string]：%s", requestBody)
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.value]：%+v", requestBody)
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlDecodeNoError.string]：%s", dorm.XmlDecodeNoError([]byte(requestBody)))
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlDecodeNoError.value]：%+v", dorm.XmlDecodeNoError([]byte(requestBody)))
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlEncodeNoError.string]：%s", dorm.XmlEncodeNoError(dorm.XmlDecodeNoError([]byte(requestBody))))
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlEncodeNoError.value]：%+v", dorm.XmlEncodeNoError(dorm.XmlDecodeNoError([]byte(requestBody))))
-	}
+func (w bodyGormWriter) WriteString(s string) (int, error) {
+	w.body.WriteString(s)
+	return w.ResponseWriter.WriteString(s)
 }
 
-// GormQuery 查询
-func (c *GinClient) GormQuery() *gorm.DB {
-	return c.gormClient.Db.Table(c.gormConfig.tableName)
+func (gg *GinGorm) jsonUnmarshal(data string) (result interface{}) {
+	_ = gojson.Unmarshal([]byte(data), &result)
+	return
 }
 
-// GormMiddleware 中间件
-func (c *GinClient) GormMiddleware() gin.HandlerFunc {
+// Middleware 中间件
+func (gg *GinGorm) Middleware() gin.HandlerFunc {
 	return func(ginCtx *gin.Context) {
 
 		// 开始时间
 		startTime := gotime.Current().TimestampWithMillisecond()
 		requestTime := gotime.Current().Time
 
-		// 获取
-		data, _ := ioutil.ReadAll(ginCtx.Request.Body)
-
-		if c.logDebug {
-			c.zapLog.WithLogger().Sugar().Infof("[golog.gin.GormMiddleware]：%s", data)
+		// 获取全部内容
+		requestBody := gorequest.NewParams()
+		queryParams := ginCtx.Request.URL.Query() // 请求URL参数
+		for key, values := range queryParams {
+			for _, value := range values {
+				requestBody.Set(key, value)
+			}
+		}
+		var dataMap map[string]interface{}
+		rawData, _ := ginCtx.GetRawData() // 请求内容参数
+		if gojson.IsValidJSON(string(rawData)) {
+			dataMap = gojson.JsonDecodeNoError(string(rawData))
+		} else {
+			dataMap = gojson.ParseQueryString(string(rawData))
+		}
+		for key, value := range dataMap {
+			requestBody.Set(key, value)
 		}
 
-		// 复用
-		ginCtx.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
+		// 重新赋值
+		ginCtx.Request.Body = ioutil.NopCloser(bytes.NewBuffer(rawData))
 
-		blw := &bodyLogWriter{body: bytes.NewBufferString(""), ResponseWriter: ginCtx.Writer}
+		blw := &bodyGormWriter{body: bytes.NewBufferString(""), ResponseWriter: ginCtx.Writer}
 		ginCtx.Writer = blw
 
 		// 处理请求
@@ -272,62 +131,15 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc {
 		responseCode := ginCtx.Writer.Status()
 		responseBody := blw.body.String()
 
-		//结束时间
+		// 结束时间
 		endTime := gotime.Current().TimestampWithMillisecond()
+		responseTime := gotime.Current().Time
 
 		go func() {
 
-			var dataJson = true
-
-			// 解析请求内容
-			var jsonBody map[string]interface{}
-
-			// 判断是否有内容
-			if len(data) > 0 {
-				err := json.Unmarshal(data, &jsonBody)
-				if err != nil {
-					dataJson = false
-				}
-			}
-
-			clientIp := gorequest.ClientIp(ginCtx.Request)
-
-			requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp := "", "", "", "", ""
-			if c.ipService != nil {
-				if net.ParseIP(clientIp).To4() != nil {
-					// IPv4
-					_, info := c.ipService.Ipv4(clientIp)
-					requestClientIpCountry = info.Country
-					requestClientIpRegion = info.Region
-					requestClientIpProvince = info.Province
-					requestClientIpCity = info.City
-					requestClientIpIsp = info.ISP
-				} else if net.ParseIP(clientIp).To16() != nil {
-					// IPv6
-					info := c.ipService.Ipv6(clientIp)
-					requestClientIpCountry = info.Country
-					requestClientIpProvince = info.Province
-					requestClientIpCity = info.City
-				}
-			}
-
 			// 记录
-			if c.gormClient != nil && c.gormClient.Db != nil {
-
-				var traceId = gotrace_id.GetGinTraceId(ginCtx)
+			gg.recordJson(ginCtx, requestTime, requestBody, responseTime, responseCode, responseBody, endTime-startTime, gorequest.ClientIp(ginCtx.Request))
 
-				if dataJson {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.GormMiddleware]准备使用{gormRecordJson}保存数据：%s", data)
-					}
-					c.gormRecordJson(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				} else {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.GormMiddleware]准备使用{gormRecordXml}保存数据：%s", data)
-					}
-					c.gormRecordXml(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				}
-			}
 		}()
 	}
 }

gin_gorm_config.go

@@ -0,0 +1,29 @@
+package golog
+
+import (
+	"context"
+	"go.dtapp.net/gorequest"
+	"runtime"
+)
+
+func (gg *GinGorm) setConfig(ctx context.Context, systemOutsideIp string) {
+
+	info := getSystem()
+
+	gg.config.systemHostname = info.SystemHostname
+	gg.config.systemOs = info.SystemOs
+	gg.config.systemVersion = info.SystemVersion
+	gg.config.systemKernel = info.SystemKernel
+	gg.config.systemKernelVersion = info.SystemKernelVersion
+	gg.config.systemBootTime = info.SystemBootTime
+	gg.config.cpuCores = info.CpuCores
+	gg.config.cpuModelName = info.CpuModelName
+	gg.config.cpuMhz = info.CpuMhz
+
+	gg.config.systemInsideIp = gorequest.GetInsideIp(ctx)
+	gg.config.systemOutsideIp = systemOutsideIp
+
+	gg.config.sdkVersion = Version
+	gg.config.goVersion = runtime.Version()
+
+}

gin_gorm_delete.go

@@ -0,0 +1,24 @@
+package golog
+
+import (
+	"context"
+	"errors"
+	"go.dtapp.net/gotime"
+)
+
+// GormDeleteData 删除N天前数据
+func (gg *GinGorm) GormDeleteData(ctx context.Context, day int) error {
+	return gg.GormDeleteDataCustom(ctx, gg.gormConfig.tableName, day)
+}
+
+// GormDeleteDataCustom 删除N天前数据
+func (gg *GinGorm) GormDeleteDataCustom(ctx context.Context, tableName string, day int) error {
+	if gg.gormConfig.stats == false {
+		return nil
+	}
+
+	if tableName == "" {
+		return errors.New("没有设置表名")
+	}
+	return gg.gormClient.Table(tableName).Where("request_time < ?", gotime.Current().BeforeDay(day).Format()).Delete(&ginPostgresqlLog{}).Error
+}

gin_gorm_record.go

@@ -0,0 +1,95 @@
+package golog
+
+import (
+	"context"
+	"github.com/gin-gonic/gin"
+	"go.dtapp.net/gojson"
+	"go.dtapp.net/gorequest"
+	"go.dtapp.net/gotrace_id"
+	"go.dtapp.net/gourl"
+	"log"
+	"time"
+)
+
+// 模型
+type ginGormLog struct {
+	LogID          int64     `gorm:"primaryKey;comment:【记录】编号" json:"log_id,omitempty"`       //【记录】编号
+	TraceID        string    `gorm:"index;comment:【系统】跟踪编号" json:"trace_id,omitempty"`        //【系统】跟踪编号
+	RequestTime    time.Time `gorm:"index;comment:【请求】时间" json:"request_time,omitempty"`      //【请求】时间
+	RequestUri     string    `gorm:"comment:【请求】链接 域名+路径+参数" json:"request_uri,omitempty"`    //【请求】链接 域名+路径+参数
+	RequestURL     string    `gorm:"comment:【请求】链接 域名+路径" json:"request_url,omitempty"`       //【请求】链接 域名+路径
+	RequestApi     string    `gorm:"index;comment:【请求】接口" json:"request_api,omitempty"`       //【请求】接口
+	RequestMethod  string    `gorm:"index;comment:【请求】方式" json:"request_method,omitempty"`    //【请求】方式
+	RequestProto   string    `gorm:"comment:【请求】协议" json:"request_proto,omitempty"`           //【请求】协议
+	RequestBody    string    `gorm:"comment:【请求】参数" json:"request_body,omitempty"`            //【请求】参数
+	RequestIP      string    `gorm:"index;comment:【请求】客户端IP" json:"request_ip,omitempty"`     //【请求】客户端IP
+	RequestHeader  string    `gorm:"comment:【请求】头部" json:"request_header,omitempty"`          //【请求】头部
+	ResponseTime   time.Time `gorm:"index;comment:【返回】时间" json:"response_time,omitempty"`     //【返回】时间
+	ResponseCode   int       `gorm:"index;comment:【返回】状态码" json:"response_code,omitempty"`    //【返回】状态码
+	ResponseData   string    `gorm:"comment:【返回】数据" json:"response_data,omitempty"`           //【返回】数据
+	CostTime       int64     `gorm:"comment:【系统】花费时间" json:"cost_time,omitempty"`             //【系统】花费时间
+	SystemHostName string    `gorm:"index;comment:【系统】主机名" json:"system_host_name,omitempty"` //【系统】主机名
+	SystemInsideIP string    `gorm:"comment:【系统】内网ip" json:"system_inside_ip,omitempty"`      //【系统】内网ip
+	SystemOs       string    `gorm:"index;comment:【系统】系统类型" json:"system_os,omitempty"`       //【系统】系统类型
+	SystemArch     string    `gorm:"index;comment:【系统】系统架构" json:"system_arch,omitempty"`     //【系统】系统架构
+	GoVersion      string    `gorm:"comment:【程序】Go版本" json:"go_version,omitempty"`            //【程序】Go版本
+	SdkVersion     string    `gorm:"comment:【程序】Sdk版本" json:"sdk_version,omitempty"`          //【程序】Sdk版本
+}
+
+// 创建模型
+func (gg *GinGorm) gormAutoMigrate(ctx context.Context) {
+	if gg.gormConfig.stats == false {
+		return
+	}
+
+	err := gg.gormClient.Table(gg.gormConfig.tableName).AutoMigrate(&ginGormLog{})
+	if err != nil {
+		log.Printf("创建模型：%s\n", err)
+	}
+}
+
+// gormRecord 记录日志
+func (gg *GinGorm) gormRecord(data ginGormLog) {
+	if gg.gormConfig.stats == false {
+		return
+	}
+
+	data.SystemHostName = gg.config.systemHostname //【系统】主机名
+	data.SystemInsideIP = gg.config.systemInsideIp //【系统】内网ip
+	data.GoVersion = gg.config.goVersion           //【程序】Go版本
+	data.SdkVersion = gg.config.sdkVersion         //【程序】Sdk版本
+	data.SystemOs = gg.config.systemOs             //【系统】系统类型
+	data.SystemArch = gg.config.systemKernel       //【系统】系统架构
+
+	err := gg.gormClient.Table(gg.gormConfig.tableName).Create(&data).Error
+	if err != nil {
+		log.Printf("记录框架日志错误：%s\n", err)
+		log.Printf("记录框架日志数据：%+v\n", data)
+	}
+}
+
+func (gg *GinGorm) recordJson(ginCtx *gin.Context, requestTime time.Time, requestBody gorequest.Params, responseTime time.Time, responseCode int, responseBody string, costTime int64, requestIp string) {
+
+	data := ginGormLog{
+		TraceID:       gotrace_id.GetGinTraceId(ginCtx),                             //【系统】跟踪编号
+		RequestTime:   requestTime,                                                  //【请求】时间
+		RequestURL:    ginCtx.Request.RequestURI,                                    //【请求】链接
+		RequestApi:    gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】接口
+		RequestMethod: ginCtx.Request.Method,                                        //【请求】方式
+		RequestProto:  ginCtx.Request.Proto,                                         //【请求】协议
+		RequestBody:   gojson.JsonEncodeNoError(requestBody),                        //【请求】参数
+		RequestIP:     requestIp,                                                    //【请求】客户端IP
+		RequestHeader: gojson.JsonEncodeNoError(ginCtx.Request.Header),              //【请求】头部
+		ResponseTime:  responseTime,                                                 //【返回】时间
+		ResponseCode:  responseCode,                                                 //【返回】状态码
+		ResponseData:  responseBody,                                                 //【返回】数据
+		CostTime:      costTime,                                                     //【系统】花费时间
+	}
+	if ginCtx.Request.TLS == nil {
+		data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】链接
+	} else {
+		data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】链接
+	}
+
+	gg.gormRecord(data)
+}

gin_mongo.go

@@ -1,404 +0,0 @@
-package golog
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"github.com/gin-gonic/gin"
-	"go.dtapp.net/dorm"
-	"go.dtapp.net/goip"
-	"go.dtapp.net/gorequest"
-	"go.dtapp.net/gotime"
-	"go.dtapp.net/gotrace_id"
-	"go.dtapp.net/gourl"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"io/ioutil"
-	"net"
-	"os"
-	"runtime"
-	"time"
-)
-
-// GinMongoClientConfig 框架实例配置
-type GinMongoClientConfig struct {
-	IpService      *goip.Client      // ip服务
-	MongoClientFun ginMongoClientFun // 日志配置
-	Debug          bool              // 日志开关
-	ZapLog         *ZapLog           // 日志服务
-}
-
-// NewGinMongoClient 创建框架实例化
-// client 数据库服务
-// databaseName 库名
-// collectionName 表名
-// ipService ip服务
-func NewGinMongoClient(config *GinMongoClientConfig) (*GinClient, error) {
-
-	var ctx = context.Background()
-
-	c := &GinClient{}
-
-	c.zapLog = config.ZapLog
-
-	c.logDebug = config.Debug
-
-	client, databaseName, collectionName := config.MongoClientFun()
-
-	if client == nil || client.Db == nil {
-		return nil, errors.New("没有设置驱动")
-	}
-
-	c.mongoClient = client
-
-	if databaseName == "" {
-		return nil, errors.New("没有设置库名")
-	}
-	c.mongoConfig.databaseName = databaseName
-
-	if collectionName == "" {
-		return nil, errors.New("没有设置表名")
-	}
-	c.mongoConfig.collectionName = collectionName
-
-	c.ipService = config.IpService
-
-	hostname, _ := os.Hostname()
-
-	c.mongoConfig.hostname = hostname
-	c.mongoConfig.insideIp = goip.GetInsideIp(ctx)
-	c.mongoConfig.goVersion = runtime.Version()
-
-	c.log.mongo = true
-
-	// 创建时间序列集合
-	c.mongoCreateCollection()
-
-	// 创建索引
-	c.mongoCreateIndexes()
-
-	return c, nil
-}
-
-// 创建时间序列集合
-func (c *GinClient) mongoCreateCollection() {
-	var commandResult bson.M
-	commandErr := c.mongoClient.Db.Database(c.mongoConfig.databaseName).RunCommand(context.TODO(), bson.D{{
-		"listCollections", 1,
-	}}).Decode(&commandResult)
-	if commandErr != nil {
-		c.zapLog.WithLogger().Sugar().Error("检查时间序列集合：", commandErr)
-	} else {
-		err := c.mongoClient.Db.Database(c.mongoConfig.databaseName).CreateCollection(context.TODO(), c.mongoConfig.collectionName, options.CreateCollection().SetTimeSeriesOptions(options.TimeSeries().SetTimeField("request_time")))
-		if err != nil {
-			c.zapLog.WithLogger().Sugar().Error("创建时间序列集合：", err)
-		}
-	}
-}
-
-// 创建索引
-func (c *GinClient) mongoCreateIndexes() {
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"trace_id", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_time", -1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_method", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_proto", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_ip", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_ip_country", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_ip_region", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_ip_province", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_ip_city", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"request_ip_isp", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"response_time", -1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"response_code", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"system_host_name", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"system_inside_ip", 1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"go_version", -1},
-		}}))
-	c.zapLog.WithLogger().Sugar().Infof(c.mongoClient.Db.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).Indexes().CreateOne(context.TODO(), mongo.IndexModel{
-		Keys: bson.D{
-			{"sdk_version", -1},
-		}}))
-}
-
-// 模型结构体
-type ginMongoLog struct {
-	LogId             primitive.ObjectID `json:"log_id,omitempty" bson:"_id,omitempty"`                              //【记录】编号
-	TraceId           string             `json:"trace_id,omitempty" bson:"trace_id,omitempty"`                       //【系统】跟踪编号
-	RequestTime       primitive.DateTime `json:"request_time,omitempty" bson:"request_time,omitempty"`               //【请求】时间
-	RequestUri        string             `json:"request_uri,omitempty" bson:"request_uri,omitempty"`                 //【请求】请求链接 域名+路径+参数
-	RequestUrl        string             `json:"request_url,omitempty" bson:"request_url,omitempty"`                 //【请求】请求链接 域名+路径
-	RequestApi        string             `json:"request_api,omitempty" bson:"request_api,omitempty"`                 //【请求】请求接口 路径
-	RequestMethod     string             `json:"request_method,omitempty" bson:"request_method,omitempty"`           //【请求】请求方式
-	RequestProto      string             `json:"request_proto,omitempty" bson:"request_proto,omitempty"`             //【请求】请求协议
-	RequestUa         string             `json:"request_ua,omitempty" bson:"request_ua,omitempty"`                   //【请求】请求UA
-	RequestReferer    string             `json:"request_referer,omitempty" bson:"request_referer,omitempty"`         //【请求】请求referer
-	RequestBody       interface{}        `json:"request_body,omitempty" bson:"request_body,omitempty"`               //【请求】请求主体
-	RequestUrlQuery   interface{}        `json:"request_url_query,omitempty" bson:"request_url_query,omitempty"`     //【请求】请求URL参数
-	RequestIp         string             `json:"request_ip,omitempty" bson:"request_ip,omitempty"`                   //【请求】请求客户端Ip
-	RequestIpCountry  string             `json:"request_ip_country,omitempty" bson:"request_ip_country,omitempty"`   //【请求】请求客户端城市
-	RequestIpRegion   string             `json:"request_ip_region,omitempty" bson:"request_ip_region,omitempty"`     //【请求】请求客户端区域
-	RequestIpProvince string             `json:"request_ip_province,omitempty" bson:"request_ip_province,omitempty"` //【请求】请求客户端省份
-	RequestIpCity     string             `json:"request_ip_city,omitempty" bson:"request_ip_city,omitempty"`         //【请求】请求客户端城市
-	RequestIpIsp      string             `json:"request_ip_isp,omitempty" bson:"request_ip_isp,omitempty"`           //【请求】请求客户端运营商
-	RequestHeader     interface{}        `json:"request_header,omitempty" bson:"request_header,omitempty"`           //【请求】请求头
-	ResponseTime      primitive.DateTime `json:"response_time,omitempty" bson:"response_time,omitempty"`             //【返回】时间
-	ResponseCode      int                `json:"response_code,omitempty" bson:"response_code,omitempty"`             //【返回】状态码
-	ResponseMsg       string             `json:"response_msg,omitempty" bson:"response_msg,omitempty"`               //【返回】描述
-	ResponseData      interface{}        `json:"response_data,omitempty" bson:"response_data,omitempty"`             //【返回】数据
-	CostTime          int64              `json:"cost_time,omitempty" bson:"cost_time,omitempty"`                     //【系统】花费时间
-	SystemHostName    string             `json:"system_host_name,omitempty" bson:"system_host_name,omitempty"`       //【系统】主机名
-	SystemInsideIp    string             `json:"system_inside_ip,omitempty" bson:"system_inside_ip,omitempty"`       //【系统】内网ip
-	GoVersion         string             `json:"go_version,omitempty" bson:"go_version,omitempty"`                   //【程序】Go版本
-	SdkVersion        string             `json:"sdk_version,omitempty" bson:"sdk_version,omitempty"`                 //【程序】Sdk版本
-}
-
-// 记录日志
-func (c *GinClient) mongoRecord(mongoLog ginMongoLog) (err error) {
-
-	mongoLog.SystemHostName = c.mongoConfig.hostname
-	mongoLog.SystemInsideIp = c.mongoConfig.insideIp
-	mongoLog.GoVersion = c.mongoConfig.goVersion
-
-	mongoLog.SdkVersion = Version
-
-	mongoLog.LogId = primitive.NewObjectID()
-
-	_, err = c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).InsertOne(mongoLog)
-	if err != nil {
-		c.zapLog.WithLogger().Sugar().Errorf("[golog.gin.mongoRecord]：%s", err)
-	}
-
-	return err
-}
-
-func (c *GinClient) mongoRecordJson(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody string, responseCode int, responseBody string, startTime, endTime int64, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp string) {
-
-	if c.logDebug {
-		c.zapLog.WithLogger().Sugar().Infof("[golog.gin.mongoRecordJson]收到保存数据要求：%s,%s", c.mongoConfig.databaseName, c.mongoConfig.collectionName)
-	}
-
-	data := ginMongoLog{
-		TraceId:           traceId,                                                      //【系统】跟踪编号
-		RequestTime:       primitive.NewDateTimeFromTime(requestTime),                   //【请求】时间
-		RequestUrl:        ginCtx.Request.RequestURI,                                    //【请求】请求链接
-		RequestApi:        gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口
-		RequestMethod:     ginCtx.Request.Method,                                        //【请求】请求方式
-		RequestProto:      ginCtx.Request.Proto,                                         //【请求】请求协议
-		RequestUa:         ginCtx.Request.UserAgent(),                                   //【请求】请求UA
-		RequestReferer:    ginCtx.Request.Referer(),                                     //【请求】请求referer
-		RequestUrlQuery:   ginCtx.Request.URL.Query(),                                   //【请求】请求URL参数
-		RequestIp:         clientIp,                                                     //【请求】请求客户端Ip
-		RequestIpCountry:  requestClientIpCountry,                                       //【请求】请求客户端城市
-		RequestIpRegion:   requestClientIpRegion,                                        //【请求】请求客户端区域
-		RequestIpProvince: requestClientIpProvince,                                      //【请求】请求客户端省份
-		RequestIpCity:     requestClientIpCity,                                          //【请求】请求客户端城市
-		RequestIpIsp:      requestClientIpIsp,                                           //【请求】请求客户端运营商
-		RequestHeader:     ginCtx.Request.Header,                                        //【请求】请求头
-		ResponseTime:      primitive.NewDateTimeFromTime(gotime.Current().Time),         //【返回】时间
-		ResponseCode:      responseCode,                                                 //【返回】状态码
-		ResponseData:      c.jsonUnmarshal(responseBody),                                //【返回】数据
-		CostTime:          endTime - startTime,                                          //【系统】花费时间
-	}
-	if ginCtx.Request.TLS == nil {
-		data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	} else {
-		data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	}
-
-	if len(requestBody) > 0 {
-		data.RequestBody = dorm.JsonDecodeNoError([]byte(requestBody)) //【请求】请求主体
-	} else {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordJson.len]：%s %s", data.RequestUri, requestBody)
-	}
-
-	err := c.mongoRecord(data)
-	if err != nil {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.mongoRecordJson]：%s", err)
-	}
-}
-
-func (c *GinClient) mongoRecordXml(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody string, responseCode int, responseBody string, startTime, endTime int64, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp string) {
-
-	if c.logDebug {
-		c.zapLog.WithLogger().Sugar().Infof("[golog.gin.mongoRecordXml]收到保存数据要求：%s,%s", c.mongoConfig.databaseName, c.mongoConfig.collectionName)
-	}
-
-	data := ginMongoLog{
-		TraceId:           traceId,                                                      //【系统】跟踪编号
-		RequestTime:       primitive.NewDateTimeFromTime(requestTime),                   //【请求】时间
-		RequestUrl:        ginCtx.Request.RequestURI,                                    //【请求】请求链接
-		RequestApi:        gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口
-		RequestMethod:     ginCtx.Request.Method,                                        //【请求】请求方式
-		RequestProto:      ginCtx.Request.Proto,                                         //【请求】请求协议
-		RequestUa:         ginCtx.Request.UserAgent(),                                   //【请求】请求UA
-		RequestReferer:    ginCtx.Request.Referer(),                                     //【请求】请求referer
-		RequestUrlQuery:   ginCtx.Request.URL.Query(),                                   //【请求】请求URL参数
-		RequestIp:         clientIp,                                                     //【请求】请求客户端Ip
-		RequestIpCountry:  requestClientIpCountry,                                       //【请求】请求客户端城市
-		RequestIpRegion:   requestClientIpRegion,                                        //【请求】请求客户端区域
-		RequestIpProvince: requestClientIpProvince,                                      //【请求】请求客户端省份
-		RequestIpCity:     requestClientIpCity,                                          //【请求】请求客户端城市
-		RequestIpIsp:      requestClientIpIsp,                                           //【请求】请求客户端运营商
-		RequestHeader:     ginCtx.Request.Header,                                        //【请求】请求头
-		ResponseTime:      primitive.NewDateTimeFromTime(gotime.Current().Time),         //【返回】时间
-		ResponseCode:      responseCode,                                                 //【返回】状态码
-		ResponseData:      c.jsonUnmarshal(responseBody),                                //【返回】数据
-		CostTime:          endTime - startTime,                                          //【系统】花费时间
-	}
-	if ginCtx.Request.TLS == nil {
-		data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	} else {
-		data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
-	}
-
-	if len(requestBody) > 0 {
-		data.RequestBody = dorm.XmlDecodeNoError([]byte(requestBody)) //【请求】请求主体
-	} else {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordXml.len]：%s %s", data.RequestUri, requestBody)
-	}
-
-	err := c.mongoRecord(data)
-	if err != nil {
-		c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.mongoRecordXml]：%s", err)
-	}
-}
-
-// MongoQuery 查询
-func (c *GinClient) MongoQuery() *dorm.MongoClient {
-	return c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName)
-}
-
-// MongoMiddleware 中间件
-func (c *GinClient) MongoMiddleware() gin.HandlerFunc {
-	return func(ginCtx *gin.Context) {
-
-		// 开始时间
-		startTime := gotime.Current().TimestampWithMillisecond()
-		requestTime := gotime.Current().Time
-
-		// 获取
-		data, _ := ioutil.ReadAll(ginCtx.Request.Body)
-
-		if c.logDebug {
-			c.zapLog.WithLogger().Sugar().Infof("[golog.gin.MongoMiddleware] %s", data)
-		}
-
-		// 复用
-		ginCtx.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
-
-		blw := &bodyLogWriter{body: bytes.NewBufferString(""), ResponseWriter: ginCtx.Writer}
-		ginCtx.Writer = blw
-
-		// 处理请求
-		ginCtx.Next()
-
-		// 响应
-		responseCode := ginCtx.Writer.Status()
-		responseBody := blw.body.String()
-
-		//结束时间
-		endTime := gotime.Current().TimestampWithMillisecond()
-
-		go func() {
-
-			var dataJson = true
-
-			// 解析请求内容
-			var jsonBody map[string]interface{}
-
-			// 判断是否有内容
-			if len(data) > 0 {
-				err := json.Unmarshal(data, &jsonBody)
-				if err != nil {
-					dataJson = false
-				}
-			}
-
-			clientIp := gorequest.ClientIp(ginCtx.Request)
-
-			requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp := "", "", "", "", ""
-			if c.ipService != nil {
-				if net.ParseIP(clientIp).To4() != nil {
-					// IPv4
-					_, info := c.ipService.Ipv4(clientIp)
-					requestClientIpCountry = info.Country
-					requestClientIpRegion = info.Region
-					requestClientIpProvince = info.Province
-					requestClientIpCity = info.City
-					requestClientIpIsp = info.ISP
-				} else if net.ParseIP(clientIp).To16() != nil {
-					// IPv6
-					info := c.ipService.Ipv6(clientIp)
-					requestClientIpCountry = info.Country
-					requestClientIpProvince = info.Province
-					requestClientIpCity = info.City
-				}
-			}
-
-			// 记录
-			if c.mongoClient != nil && c.mongoClient.Db != nil {
-
-				var traceId = gotrace_id.GetGinTraceId(ginCtx)
-
-				if dataJson {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.MongoMiddleware]准备使用{mongoRecordJson}保存数据：%s", data)
-					}
-					c.mongoRecordJson(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				} else {
-					if c.logDebug {
-						c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.MongoMiddleware]准备使用{mongoRecordXml}保存数据：%s", data)
-					}
-					c.mongoRecordXml(ginCtx, traceId, requestTime, string(data), responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp)
-				}
-			}
-		}()
-	}
-}

gin_slog.go

@@ -0,0 +1,101 @@
+package golog
+
+import (
+	"bytes"
+	"context"
+	"github.com/gin-gonic/gin"
+	"go.dtapp.net/gojson"
+	"go.dtapp.net/gorequest"
+	"go.dtapp.net/gotime"
+	"io/ioutil"
+)
+
+// GinSLog 框架日志
+type GinSLog struct {
+	slog struct {
+		status bool  // 状态
+		client *SLog // 日志服务
+	}
+}
+
+// GinSLogFun  框架日志驱动
+type GinSLogFun func() *GinSLog
+
+// NewGinSLog 创建框架实例化
+func NewGinSLog(ctx context.Context) (*GinSLog, error) {
+	c := &GinSLog{}
+	return c, nil
+}
+
+type bodySLogWriter struct {
+	gin.ResponseWriter
+	body *bytes.Buffer
+}
+
+func (w bodySLogWriter) Write(b []byte) (int, error) {
+	w.body.Write(b)
+	return w.ResponseWriter.Write(b)
+}
+
+func (w bodySLogWriter) WriteString(s string) (int, error) {
+	w.body.WriteString(s)
+	return w.ResponseWriter.WriteString(s)
+}
+
+func (gl *GinSLog) jsonUnmarshal(data string) (result interface{}) {
+	_ = gojson.Unmarshal([]byte(data), &result)
+	return
+}
+
+// Middleware 中间件
+func (gl *GinSLog) Middleware() gin.HandlerFunc {
+	return func(ginCtx *gin.Context) {
+
+		// 开始时间
+		startTime := gotime.Current().TimestampWithMillisecond()
+		requestTime := gotime.Current().Time
+
+		// 获取全部内容
+		requestAllContent := gorequest.NewParams()
+		queryParams := ginCtx.Request.URL.Query() // 请求URL参数
+		for key, values := range queryParams {
+			for _, value := range values {
+				requestAllContent.Set(key, value)
+			}
+		}
+		var dataMap map[string]interface{}
+		rawData, _ := ginCtx.GetRawData() // 请求内容参数
+		if gojson.IsValidJSON(string(rawData)) {
+			dataMap = gojson.JsonDecodeNoError(string(rawData))
+		} else {
+			dataMap = gojson.ParseQueryString(string(rawData))
+		}
+		for key, value := range dataMap {
+			requestAllContent.Set(key, value)
+		}
+
+		// 重新赋值
+		ginCtx.Request.Body = ioutil.NopCloser(bytes.NewBuffer(rawData))
+
+		blw := &bodySLogWriter{body: bytes.NewBufferString(""), ResponseWriter: ginCtx.Writer}
+		ginCtx.Writer = blw
+
+		// 处理请求
+		ginCtx.Next()
+
+		// 响应
+		responseCode := ginCtx.Writer.Status()
+		responseBody := blw.body.String()
+
+		// 结束时间
+		endTime := gotime.Current().TimestampWithMillisecond()
+		responseTime := gotime.Current().Time
+
+		go func() {
+
+			// 记录
+			gl.recordJson(ginCtx, requestTime, requestAllContent, responseTime, responseCode, responseBody, endTime-startTime, gorequest.ClientIp(ginCtx.Request))
+
+		}()
+	}
+}

gin_slog_cofing.go

@@ -0,0 +1,20 @@
+package golog
+
+// ConfigSLogClientFun 日志配置
+func (gl *GinSLog) ConfigSLogClientFun(sLogFun SLogFun) {
+	sLog := sLogFun()
+	if sLog != nil {
+		gl.slog.client = sLog
+		gl.slog.status = true
+	}
+}
+
+// ConfigSLogResultClientFun 日志配置然后返回
+func (gl *GinSLog) ConfigSLogResultClientFun(sLogFun SLogFun) *GinSLog {
+	sLog := sLogFun()
+	if sLog != nil {
+		gl.slog.client = sLog
+		gl.slog.status = true
+	}
+	return gl
+}

gin_slog_custom.go

@@ -0,0 +1,22 @@
+package golog
+
+import (
+	"context"
+)
+
+// GinSLogCustom 框架自定义日志
+type GinSLogCustom struct {
+	slog struct {
+		status bool  // 状态
+		client *SLog // 日志服务
+	}
+}
+
+// GinSLogCustomFun  框架自定义日志驱动
+type GinSLogCustomFun func() *GinSLogCustom
+
+// NewGinSLogCustom 创建框架实例化
+func NewGinSLogCustom(ctx context.Context) (*GinSLogCustom, error) {
+	c := &GinSLogCustom{}
+	return c, nil
+}

gin_slog_custom_config.go

@@ -0,0 +1,20 @@
+package golog
+
+// ConfigSLogClientFun 日志配置
+func (c *GinSLogCustom) ConfigSLogClientFun(sLogFun SLogFun) {
+	sLog := sLogFun()
+	if sLog != nil {
+		c.slog.client = sLog
+		c.slog.status = true
+	}
+}
+
+// ConfigSLogResultClientFun 日志配置然后返回
+func (c *GinSLogCustom) ConfigSLogResultClientFun(sLogFun SLogFun) *GinSLogCustom {
+	sLog := sLogFun()
+	if sLog != nil {
+		c.slog.client = sLog
+		c.slog.status = true
+	}
+	return c
+}

gin_slog_custom_record.go

@@ -0,0 +1,100 @@
+package golog
+
+import (
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"go.dtapp.net/gojson"
+	"go.dtapp.net/gorequest"
+	"go.dtapp.net/gotrace_id"
+	"go.dtapp.net/gourl"
+)
+
+// 结构体
+type ginSLogCustom struct {
+	TraceID         string `json:"trace_id,omitempty"`          //【系统】跟踪编号
+	RequestUri      string `json:"request_uri,omitempty"`       //【请求】请求链接 域名+路径+参数
+	RequestUrl      string `json:"request_url,omitempty"`       //【请求】请求链接 域名+路径
+	RequestApi      string `json:"request_api,omitempty"`       //【请求】请求接口 路径
+	RequestMethod   string `json:"request_method,omitempty"`    //【请求】请求方式
+	RequestProto    string `json:"request_proto,omitempty"`     //【请求】请求协议
+	RequestUa       string `json:"request_ua,omitempty"`        //【请求】请求UA
+	RequestReferer  string `json:"request_referer,omitempty"`   //【请求】请求referer
+	RequestUrlQuery string `json:"request_url_query,omitempty"` //【请求】请求URL参数
+	RequestHeader   string `json:"request_header,omitempty"`    //【请求】请求头
+	RequestIP       string `json:"request_ip,omitempty"`        //【请求】请求客户端IP
+	CustomID        string `json:"custom_id,omitempty"`         //【日志】自定义编号
+	CustomType      string `json:"custom_type,omitempty"`       //【日志】自定义类型
+	CustomContent   string `json:"custom_content,omitempty"`    //【日志】自定义内容
+}
+
+type GinCustomClientGinRecordOperation struct {
+	slogClient *SLog          // 日志服务
+	data       *ginSLogCustom // 数据
+}
+
+// GinRecord 记录日志
+func (c *GinSLogCustom) GinRecord(ginCtx *gin.Context) *GinCustomClientGinRecordOperation {
+	operation := &GinCustomClientGinRecordOperation{
+		slogClient: c.slog.client,
+	}
+	operation.data = new(ginSLogCustom)
+	operation.data.TraceID = gotrace_id.GetGinTraceId(ginCtx) // 【系统】跟踪编号
+	if ginCtx.Request.TLS == nil {
+		operation.data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
+	} else {
+		operation.data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
+	}
+	operation.data.RequestUrl = ginCtx.Request.RequestURI                                    //【请求】请求链接 域名+路径
+	operation.data.RequestApi = gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI) //【请求】请求接口 路径
+	operation.data.RequestMethod = ginCtx.Request.Method                                     //【请求】请求方式
+	operation.data.RequestProto = ginCtx.Request.Proto                                       //【请求】请求协议
+	operation.data.RequestUa = ginCtx.Request.UserAgent()                                    //【请求】请求UA
+	operation.data.RequestReferer = ginCtx.Request.Referer()                                 //【请求】请求referer
+	operation.data.RequestUrlQuery = gojson.JsonEncodeNoError(ginCtx.Request.URL.Query())    //【请求】请求URL参数
+	operation.data.RequestHeader = gojson.JsonEncodeNoError(ginCtx.Request.Header)           //【请求】请求头
+	operation.data.RequestIP = gorequest.ClientIp(ginCtx.Request)                            //【请求】请求客户端Ip
+	return operation
+}
+
+func (o *GinCustomClientGinRecordOperation) CustomInfo(customId any, customType any, customContent any) *GinCustomClientGinRecordOperation {
+	o.data.CustomID = fmt.Sprintf("%s", customId)           //【日志】自定义编号
+	o.data.CustomType = fmt.Sprintf("%s", customType)       //【日志】自定义类型
+	o.data.CustomContent = fmt.Sprintf("%s", customContent) //【日志】自定义内容
+	return o
+}
+
+func (o *GinCustomClientGinRecordOperation) CreateData() {
+	o.slogClient.WithTraceIdStr(o.data.TraceID).Info("custom",
+		"request_uri", o.data.RequestUri,
+		"request_url", o.data.RequestUrl,
+		"request_api", o.data.RequestApi,
+		"request_method", o.data.RequestMethod,
+		"request_proto", o.data.RequestProto,
+		"request_ua", o.data.RequestUa,
+		"request_referer", o.data.RequestReferer,
+		"request_url_query", o.data.RequestUrlQuery,
+		"request_header", o.data.RequestHeader,
+		"request_ip", o.data.RequestIP,
+		"custom_id", o.data.CustomID,
+		"custom_type", o.data.CustomType,
+		"custom_content", o.data.CustomContent,
+	)
+}
+
+func (o *GinCustomClientGinRecordOperation) CreateDataNoError() {
+	o.slogClient.WithTraceIdStr(o.data.TraceID).Info("custom",
+		"request_uri", o.data.RequestUri,
+		"request_url", o.data.RequestUrl,
+		"request_api", o.data.RequestApi,
+		"request_method", o.data.RequestMethod,
+		"request_proto", o.data.RequestProto,
+		"request_ua", o.data.RequestUa,
+		"request_referer", o.data.RequestReferer,
+		"request_url_query", o.data.RequestUrlQuery,
+		"request_header", o.data.RequestHeader,
+		"request_ip", o.data.RequestIP,
+		"custom_id", o.data.CustomID,
+		"custom_type", o.data.CustomType,
+		"custom_content", o.data.CustomContent,
+	)
+}

gin_slog_record.go

@@ -0,0 +1,70 @@
+package golog
+
+import (
+	"github.com/gin-gonic/gin"
+	"go.dtapp.net/gorequest"
+	"go.dtapp.net/gotrace_id"
+	"go.dtapp.net/gourl"
+	"time"
+)
+
+// 结构体
+type ginSLog struct {
+	TraceID       string                 `json:"trace_id,omitempty"`       //【系统】跟踪编号
+	RequestTime   time.Time              `json:"request_time,omitempty"`   //【请求】时间
+	RequestUri    string                 `json:"request_uri,omitempty"`    //【请求】请求链接 域名+路径+参数
+	RequestUrl    string                 `json:"request_url,omitempty"`    //【请求】请求链接 域名+路径
+	RequestApi    string                 `json:"request_api,omitempty"`    //【请求】请求接口 路径
+	RequestMethod string                 `json:"request_method,omitempty"` //【请求】请求方式
+	RequestProto  string                 `json:"request_proto,omitempty"`  //【请求】请求协议
+	RequestBody   map[string]interface{} `json:"request_body,omitempty"`   //【请求】请求参数
+	RequestIP     string                 `json:"request_ip,omitempty"`     //【请求】请求客户端IP
+	RequestHeader map[string][]string    `json:"request_header,omitempty"` //【请求】请求头
+	ResponseTime  time.Time              `json:"response_time,omitempty"`  //【返回】时间
+	ResponseCode  int                    `json:"response_code,omitempty"`  //【返回】状态码
+	ResponseData  string                 `json:"response_data,omitempty"`  //【返回】数据
+	CostTime      int64                  `json:"cost_time,omitempty"`      //【系统】花费时间
+}
+
+// record 记录日志
+func (gl *GinSLog) record(msg string, data ginSLog) {
+	gl.slog.client.WithTraceIdStr(data.TraceID).Info(msg,
+		"request_time", data.RequestTime,
+		"request_uri", data.RequestUri,
+		"request_url", data.RequestUrl,
+		"request_api", data.RequestApi,
+		"request_method", data.RequestMethod,
+		"request_proto", data.RequestProto,
+		"request_body", data.RequestBody,
+		"request_ip", data.RequestIP,
+		"request_header", data.RequestHeader,
+		"response_time", data.ResponseTime,
+		"response_code", data.ResponseCode,
+		"response_data", data.ResponseData,
+		"cost_time", data.CostTime,
+	)
+}
+
+func (gl *GinSLog) recordJson(ginCtx *gin.Context, requestTime time.Time, request_body gorequest.Params, responseTime time.Time, responseCode int, responseBody string, costTime int64, requestIp string) {
+	data := ginSLog{
+		TraceID:       gotrace_id.GetGinTraceId(ginCtx),                             //【系统】跟踪编号
+		RequestTime:   requestTime,                                                  //【请求】时间
+		RequestUrl:    ginCtx.Request.RequestURI,                                    //【请求】请求链接
+		RequestApi:    gourl.UriFilterExcludeQueryString(ginCtx.Request.RequestURI), //【请求】请求接口
+		RequestMethod: ginCtx.Request.Method,                                        //【请求】请求方式
+		RequestProto:  ginCtx.Request.Proto,                                         //【请求】请求协议
+		RequestBody:   request_body,                                                 //【请求】请求参数
+		RequestIP:     requestIp,                                                    //【请求】请求客户端IP
+		RequestHeader: ginCtx.Request.Header,                                        //【请求】请求头
+		ResponseTime:  responseTime,                                                 //【返回】时间
+		ResponseCode:  responseCode,                                                 //【返回】状态码
+		ResponseData:  responseBody,                                                 //【返回】数据
+		CostTime:      costTime,                                                     //【系统】花费时间
+	}
+	if ginCtx.Request.TLS == nil {
+		data.RequestUri = "http://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
+	} else {
+		data.RequestUri = "https://" + ginCtx.Request.Host + ginCtx.Request.RequestURI //【请求】请求链接
+	}
+	gl.record("json", data)
+}

go.mod

@@ -1,97 +1,57 @@
 module go.dtapp.net/golog
 
-go 1.19
+go 1.21.5
 
 require (
-	github.com/gin-gonic/gin v1.8.1
+	github.com/gin-gonic/gin v1.9.1
 	github.com/natefinch/lumberjack v2.0.0+incompatible
-	go.dtapp.net/dorm v1.0.31
-	go.dtapp.net/goip v1.0.28
-	go.dtapp.net/gorequest v1.0.28
-	go.dtapp.net/gotime v1.0.5
-	go.dtapp.net/gotrace_id v1.0.6
+	github.com/shirou/gopsutil v3.21.11+incompatible
+	go.dtapp.net/gojson v1.0.4
+	go.dtapp.net/gorequest v1.0.46
+	go.dtapp.net/gotime v1.0.6
+	go.dtapp.net/gotrace_id v1.0.8
 	go.dtapp.net/gourl v1.0.0
-	go.mongodb.org/mongo-driver v1.10.1
-	go.uber.org/zap v1.23.0
-	gorm.io/datatypes v1.0.7
-	gorm.io/gorm v1.23.8
+	gorm.io/gorm v1.25.5
 )
 
 require (
+	github.com/BurntSushi/toml v1.3.2 // indirect
+	github.com/MercuryEngineering/CookieMonster v0.0.0-20180304172713-1584578b3403 // indirect
 	github.com/basgys/goxml2json v1.1.0 // indirect
-	github.com/beego/beego/v2 v2.0.5 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/denisenkom/go-mssqldb v0.12.2 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.11.0 // indirect
-	github.com/go-redis/redis/v9 v9.0.0-beta.2 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/goccy/go-json v0.9.11 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/hashicorp/golang-lru v0.5.4 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.13.0 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/jackc/pgx/v4 v4.17.2 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.16.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.15.9 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/lib/pq v1.10.6 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.6.6 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/saracen/go7z v0.0.0-20191010121135-9c09b6bd7fda // indirect
-	github.com/saracen/solidblock v0.0.0-20190426153529-45df20abab6f // indirect
-	github.com/segmentio/fasthash v1.0.3 // indirect
-	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/syndtr/goleveldb v1.0.0 // indirect
-	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
-	github.com/ugorji/go/codec v1.2.7 // indirect
-	github.com/ulikunitz/xz v0.5.10 // indirect
-	github.com/upper/db/v4 v4.6.0 // indirect
-	github.com/uptrace/bun v1.1.8 // indirect
-	github.com/uptrace/bun/dialect/mysqldialect v1.1.8 // indirect
-	github.com/uptrace/bun/dialect/pgdialect v1.1.8 // indirect
-	github.com/uptrace/bun/driver/pgdriver v1.1.8 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	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/gorandom v1.0.1 // indirect
-	go.dtapp.net/gostring v1.0.10 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b // indirect
-	golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
-	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/yusufpapurcu/wmi v1.2.3 // indirect
+	go.dtapp.net/gorandom v1.0.2 // indirect
+	go.dtapp.net/gostring v1.0.13 // indirect
+	golang.org/x/arch v0.6.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gorm.io/driver/mysql v1.3.6 // indirect
-	gorm.io/driver/postgres v1.3.9 // indirect
-	gorm.io/driver/sqlite v1.3.6 // indirect
-	gorm.io/driver/sqlserver v1.3.2 // indirect
-	mellium.im/sasl v0.3.0 // indirect
-	modernc.org/libc v1.16.19 // indirect
-	modernc.org/sqlite v1.18.0 // indirect
-	xorm.io/builder v0.3.12 // indirect
-	xorm.io/xorm v1.3.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

slog.go

@@ -0,0 +1,131 @@
+package golog
+
+import (
+	"context"
+	"github.com/natefinch/lumberjack"
+	"go.dtapp.net/gotime"
+	"go.dtapp.net/gotrace_id"
+	"log/slog"
+	"os"
+)
+
+type SLogFun func() *SLog
+
+type sLogConfig struct {
+	logPath    string // [File]日志文件路径
+	logName    string // [File]日志文件名
+	maxSize    int    // [File]单位为MB,默认为512MB
+	maxBackups int    // [File]保留旧文件的最大个数
+	maxAge     int    // [File]文件最多保存多少天 0=不删除
+	showLine   bool   // [File、Console]显示代码行
+}
+
+type SLog struct {
+	config      *sLogConfig
+	jsonHandler *slog.JSONHandler
+	textHandler *slog.TextHandler
+	logger      *slog.Logger
+}
+
+type SLogFileConfig struct {
+	LogPath    string // 日志文件路径
+	LogName    string // 日志文件名
+	MaxSize    int    // 单位为MB,默认为512MB
+	MaxBackups int    // 保留旧文件的最大个数
+	MaxAge     int    // 文件最多保存多少天 0=不删除
+	ShowLine   bool   // 显示代码行
+}
+
+func NewSlogFile(ctx context.Context, config *SLogFileConfig) *SLog {
+
+	sl := &SLog{
+		config: &sLogConfig{
+			logPath:    config.LogPath,
+			logName:    config.LogName,
+			maxSize:    config.MaxSize,
+			maxBackups: config.MaxBackups,
+			maxAge:     config.MaxAge,
+			showLine:   config.ShowLine,
+		},
+	}
+
+	opts := slog.HandlerOptions{
+		AddSource: sl.config.showLine,
+		Level:     slog.LevelDebug,
+		ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
+			if a.Key == slog.TimeKey {
+				a.Value = slog.StringValue(a.Value.Time().Format(gotime.DateTimeFormat))
+				//return slog.Attr{}
+			}
+			return a
+		},
+	}
+
+	lumberjackLogger := lumberjack.Logger{
+		Filename:   sl.config.logPath + sl.config.logName, // ⽇志⽂件路径
+		MaxSize:    sl.config.maxSize,                     // 单位为MB,默认为512MB
+		MaxAge:     sl.config.maxAge,                      // 文件最多保存多少天
+		MaxBackups: sl.config.maxBackups,                  // 保留旧文件的最大个数
+	}
+
+	// json格式输出
+	sl.jsonHandler = slog.NewJSONHandler(&lumberjackLogger, &opts)
+	sl.logger = slog.New(sl.jsonHandler)
+
+	return sl
+}
+
+type SLogConsoleConfig struct {
+	ShowLine bool // 显示代码行
+}
+
+func NewSlogConsole(ctx context.Context, config *SLogConsoleConfig) *SLog {
+
+	sl := &SLog{
+		config: &sLogConfig{
+			showLine: config.ShowLine,
+		},
+	}
+
+	opts := slog.HandlerOptions{
+		AddSource: sl.config.showLine,
+		Level:     slog.LevelDebug,
+		ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
+			if a.Key == slog.TimeKey {
+				a.Value = slog.StringValue(a.Value.Time().Format(gotime.DateTimeFormat))
+				//return slog.Attr{}
+			}
+			return a
+		},
+	}
+
+	// json格式输出
+	sl.jsonHandler = slog.NewJSONHandler(os.Stdout, &opts)
+	sl.logger = slog.New(sl.jsonHandler)
+
+	return sl
+}
+
+// WithLogger 跟踪编号
+func (sl *SLog) WithLogger() *slog.Logger {
+	logger := slog.New(sl.jsonHandler)
+	return logger
+}
+
+// WithTraceId 跟踪编号
+func (sl *SLog) WithTraceId(ctx context.Context) *slog.Logger {
+	jsonHandler := sl.jsonHandler.WithAttrs([]slog.Attr{
+		slog.String("trace_id", gotrace_id.GetTraceIdContext(ctx)),
+	})
+	logger := slog.New(jsonHandler)
+	return logger
+}
+
+// WithTraceIdStr 跟踪编号
+func (sl *SLog) WithTraceIdStr(traceId string) *slog.Logger {
+	jsonHandler := sl.jsonHandler.WithAttrs([]slog.Attr{
+		slog.String("trace_id", traceId),
+	})
+	logger := slog.New(jsonHandler)
+	return logger
+}

system.go

@@ -1,33 +0,0 @@
-package golog
-
-import (
-	"os"
-	"runtime"
-)
-
-type System struct {
-	Variable []string // 环境变量
-	Hostname string   // 主机名
-	Twd      string   // 当前目录
-	Uid      int      // 用户ID
-	EUid     int      // 有效用户ID
-	Gid      int      // 组ID
-	EGid     int      // 有效组ID
-	Pid      int      // 进程ID
-	PPid     int      // 父进程ID
-	Version  string   // 版本
-}
-
-func (s *System) Init() *System {
-	s.Variable = os.Environ()
-	s.Hostname, _ = os.Hostname()
-	s.Twd, _ = os.Getwd()
-	s.Uid = os.Getuid()
-	s.EUid = os.Geteuid()
-	s.Gid = os.Getgid()
-	s.EGid = os.Getegid()
-	s.Pid = os.Getpid()
-	s.PPid = os.Getppid()
-	s.Version = runtime.Version()
-	return s
-}

version.go

@@ -1,5 +1,5 @@
 package golog
 
 const (
-	Version = "1.0.65"
+	Version = "1.0.109"
 )

zap.go

@@ -1,137 +0,0 @@
-package golog
-
-import (
-	"context"
-	"github.com/natefinch/lumberjack"
-	"go.dtapp.net/gotime"
-	"go.dtapp.net/gotrace_id"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"os"
-	"time"
-)
-
-type ZapLogConfig struct {
-	LogPath      string // 日志文件路径
-	LogName      string // 日志文件名
-	MaxSize      int    // 单位为MB,默认为512MB
-	MaxBackups   int    // 保留旧文件的最大个数
-	MaxAge       int    // 文件最多保存多少天 0=不删除
-	LocalTime    bool   // 采用本地时间
-	Compress     bool   // 是否压缩日志
-	JsonFormat   bool   // 是否输出为json格式
-	ShowLine     bool   // 显示代码行
-	LogInConsole bool   // 是否同时输出到控制台
-}
-
-type ZapLog struct {
-	config  *ZapLogConfig
-	logger  *zap.Logger
-	zapCore zapcore.Core
-}
-
-func NewZapLog(config *ZapLogConfig) *ZapLog {
-
-	zl := &ZapLog{config: config}
-
-	var syncer zapcore.WriteSyncer
-
-	if zl.config.LogPath != "" && zl.config.LogName != "" {
-		// 定义日志切割配置
-		hook := lumberjack.Logger{
-			Filename:   zl.config.LogPath + zl.config.LogName, // ⽇志⽂件路径
-			MaxSize:    zl.config.MaxSize,                     // 单位为MB,默认为512MB
-			MaxBackups: zl.config.MaxBackups,                  // 保留旧文件的最大个数
-			LocalTime:  zl.config.LocalTime,                   // 采用本地时间
-			Compress:   zl.config.Compress,                    // 是否压缩日志
-		}
-		if zl.config.MaxAge > 0 {
-			// 文件最多保存多少天
-			hook.MaxAge = zl.config.MaxAge
-		}
-		if zl.config.LogInConsole {
-			// 在控制台和文件输出日志
-			syncer = zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(&hook))
-		} else {
-			// 在文件输出日志
-			syncer = zapcore.AddSync(&hook)
-		}
-	} else {
-		// 在控制台输出日志
-		syncer = zapcore.NewMultiWriteSyncer()
-	}
-
-	// 自定义时间输出格式
-	customTimeEncoder := func(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
-		enc.AppendString(t.Format(gotime.DateTimeFormat))
-	}
-
-	// 自定义日志级别显示
-	customLevelEncoder := func(level zapcore.Level, enc zapcore.PrimitiveArrayEncoder) {
-		enc.AppendString(level.CapitalString())
-	}
-
-	// 定义zap配置信息
-	encoderConf := zapcore.EncoderConfig{
-		CallerKey:      "caller_line", // 打印文件名和行数
-		LevelKey:       "level_name",
-		MessageKey:     "msg",
-		TimeKey:        "time",
-		NameKey:        "logger",
-		StacktraceKey:  "stacktrace",
-		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeTime:     customTimeEncoder,          // 自定义时间格式
-		EncodeLevel:    customLevelEncoder,         // 小写编码器
-		EncodeCaller:   zapcore.ShortCallerEncoder, // 全路径编码器
-		EncodeDuration: zapcore.SecondsDurationEncoder,
-		EncodeName:     zapcore.FullNameEncoder,
-	}
-
-	// 判断是否json格式输出
-	if zl.config.JsonFormat {
-		zl.zapCore = zapcore.NewCore(zapcore.NewJSONEncoder(encoderConf),
-			syncer, zap.NewAtomicLevelAt(zapcore.InfoLevel))
-	} else {
-		zl.zapCore = zapcore.NewCore(zapcore.NewConsoleEncoder(encoderConf),
-			syncer, zap.NewAtomicLevelAt(zapcore.InfoLevel))
-	}
-
-	zl.logger = zl.withShowLine(zap.New(zl.zapCore))
-
-	return zl
-}
-
-// 判断是否显示代码行号
-func (zl *ZapLog) withShowLine(logger *zap.Logger) *zap.Logger {
-	if zl.config.ShowLine {
-		logger = logger.WithOptions(zap.AddCaller())
-	}
-	return logger
-}
-
-// WithLogger 跟踪编号
-func (zl *ZapLog) WithLogger() *zap.Logger {
-	return zl.logger
-}
-
-// WithTraceId 跟踪编号
-func (zl *ZapLog) WithTraceId(ctx context.Context) *zap.Logger {
-	logger := zl.logger
-	logger = logger.With(zapcore.Field{
-		Key:    "trace_id",
-		Type:   zapcore.StringType,
-		String: gotrace_id.GetTraceIdContext(ctx),
-	})
-	return logger
-}
-
-// WithTraceIdStr 跟踪编号
-func (zl *ZapLog) WithTraceIdStr(traceId string) *zap.Logger {
-	logger := zl.logger
-	logger = logger.With(zapcore.Field{
-		Key:    "trace_id",
-		Type:   zapcore.StringType,
-		String: traceId,
-	})
-	return logger
-}