diff --git a/api_gorm.go b/api_gorm.go index 521b5d1..c09b1ba 100644 --- a/api_gorm.go +++ b/api_gorm.go @@ -45,7 +45,7 @@ func (c *ApiClient) gormAutoMigrate(ctx context.Context) { } // 记录日志 -func (c *ApiClient) gormRecord(ctx context.Context, data apiPostgresqlLog) (err error) { +func (c *ApiClient) gormRecord(ctx context.Context, data apiPostgresqlLog) { if utf8.ValidString(data.ResponseBody) == false { data.ResponseBody = "" @@ -59,11 +59,11 @@ func (c *ApiClient) gormRecord(ctx context.Context, data apiPostgresqlLog) (err data.SystemOs = c.config.systemOs //【系统】系统类型 data.SystemArch = c.config.systemArch //【系统】系统架构 - err = c.gormClient.GetDb().Table(c.gormConfig.tableName).Create(&data).Error + err := c.gormClient.GetDb().Table(c.gormConfig.tableName).Create(&data).Error if err != nil { - c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录接口日志失败:%s", err) + c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录接口日志错误:%s", err) + c.zapLog.WithTraceId(ctx).Sugar().Errorf("记录接口日志数据:%+v", data) } - return } // GormDelete 删除 diff --git a/api_mongo.go b/api_mongo.go index 0a888cf..7601512 100644 --- a/api_mongo.go +++ b/api_mongo.go @@ -72,23 +72,23 @@ func (c *ApiClient) MongoDelete(ctx context.Context, hour int64) (*mongo.DeleteR } // 记录日志 -func (c *ApiClient) mongoRecord(ctx context.Context, mongoLog apiMongolLog, sdkVersion string) (err error) { +func (c *ApiClient) mongoRecord(ctx context.Context, data apiMongolLog, sdkVersion string) { - mongoLog.System.HostName = c.config.systemHostName //【系统】主机名 - mongoLog.System.InsideIp = c.config.systemInsideIp //【系统】内网ip - mongoLog.System.Os = c.config.systemOs //【系统】系统类型 - mongoLog.System.Arch = c.config.systemArch //【系统】系统架构 - mongoLog.Version.Go = c.config.goVersion //【程序】Go版本 - mongoLog.Version.Sdk = sdkVersion //【程序】Sdk版本 - mongoLog.TraceId = gotrace_id.GetTraceIdContext(ctx) //【记录】跟踪编号 - mongoLog.RequestIp = c.config.systemOutsideIp //【请求】请求Ip - mongoLog.LogId = primitive.NewObjectID() //【记录】编号 + data.System.HostName = c.config.systemHostName //【系统】主机名 + data.System.InsideIp = c.config.systemInsideIp //【系统】内网ip + data.System.Os = c.config.systemOs //【系统】系统类型 + data.System.Arch = c.config.systemArch //【系统】系统架构 + data.Version.Go = c.config.goVersion //【程序】Go版本 + data.Version.Sdk = sdkVersion //【程序】Sdk版本 + data.TraceId = gotrace_id.GetTraceIdContext(ctx) //【记录】跟踪编号 + data.RequestIp = c.config.systemOutsideIp //【请求】请求Ip + data.LogId = primitive.NewObjectID() //【记录】编号 - _, err = c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).InsertOne(ctx, mongoLog) + _, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).InsertOne(ctx, data) if err != nil { - c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存接口日志失败:%s", err) + c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存接口日志错误:%s", err) + c.zapLog.WithTraceId(ctx).Sugar().Errorf("保存接口日志数据:%+v", data) } - return err } // 中间件 diff --git a/const.go b/const.go index 0e2f855..6a69078 100644 --- a/const.go +++ b/const.go @@ -1,5 +1,5 @@ package golog const ( - Version = "1.0.93" + Version = "1.0.94" ) diff --git a/gin_gorm.go b/gin_gorm.go index d90617d..9498c65 100644 --- a/gin_gorm.go +++ b/gin_gorm.go @@ -54,7 +54,7 @@ func (c *GinClient) gormAutoMigrate(ctx context.Context) { } // gormRecord 记录日志 -func (c *GinClient) gormRecord(data ginPostgresqlLog) (err error) { +func (c *GinClient) gormRecord(data ginPostgresqlLog) { data.SystemHostName = c.config.systemHostName //【系统】主机名 data.SystemInsideIp = c.config.systemInsideIp //【系统】内网ip @@ -63,11 +63,11 @@ func (c *GinClient) gormRecord(data ginPostgresqlLog) (err error) { data.SystemOs = c.config.systemOs //【系统】系统类型 data.SystemArch = c.config.systemArch //【系统】系统架构 - err = c.gormClient.GetDb().Table(c.gormConfig.tableName).Create(&data).Error + err := c.gormClient.GetDb().Table(c.gormConfig.tableName).Create(&data).Error if err != nil { - c.zapLog.WithTraceIdStr(data.TraceId).Sugar().Errorf("记录框架日志失败:%s", err) + c.zapLog.WithTraceIdStr(data.TraceId).Sugar().Errorf("记录框架日志错误:%s", err) + c.zapLog.WithTraceIdStr(data.TraceId).Sugar().Errorf("记录框架日志数据:%+v", data) } - return } func (c *GinClient) gormRecordJson(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody []byte, responseCode int, responseBody string, startTime, endTime int64, ipInfo goip.AnalyseResult) { diff --git a/gin_mongo.go b/gin_mongo.go index 61d2b6b..33e228e 100644 --- a/gin_mongo.go +++ b/gin_mongo.go @@ -119,21 +119,21 @@ func (c *GinClient) MongoDelete(ctx context.Context, hour int64) (*mongo.DeleteR } // 记录日志 -func (c *GinClient) mongoRecord(ctx context.Context, mongoLog ginMongoLog) (err error) { +func (c *GinClient) mongoRecord(ctx context.Context, data ginMongoLog) { - mongoLog.System.HostName = c.config.systemHostName //【系统】主机名 - mongoLog.System.InsideIp = c.config.systemInsideIp //【系统】内网ip - mongoLog.System.Os = c.config.systemOs //【系统】系统类型 - mongoLog.System.Arch = c.config.systemArch //【系统】系统架构 - mongoLog.Version.Go = c.config.goVersion //【程序】Go版本 - mongoLog.Version.Sdk = c.config.sdkVersion //【程序】Sdk版本 - mongoLog.LogId = primitive.NewObjectID() //【记录】编号 + data.System.HostName = c.config.systemHostName //【系统】主机名 + data.System.InsideIp = c.config.systemInsideIp //【系统】内网ip + data.System.Os = c.config.systemOs //【系统】系统类型 + data.System.Arch = c.config.systemArch //【系统】系统架构 + data.Version.Go = c.config.goVersion //【程序】Go版本 + data.Version.Sdk = c.config.sdkVersion //【程序】Sdk版本 + data.LogId = primitive.NewObjectID() //【记录】编号 - _, err = c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).InsertOne(ctx, mongoLog) + _, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(c.mongoConfig.collectionName).InsertOne(ctx, data) if err != nil { - c.zapLog.WithTraceIdStr(mongoLog.TraceId).Sugar().Errorf("保存框架日志失败:%s", err) + c.zapLog.WithTraceIdStr(data.TraceId).Sugar().Errorf("保存框架日志错误:%s", err) + c.zapLog.WithTraceIdStr(data.TraceId).Sugar().Errorf("保存框架日志数据:%+v", data) } - return err } func (c *GinClient) mongoRecordJson(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody []byte, responseCode int, responseBody string, startTime, endTime int64, ipInfo goip.AnalyseResult) {