From b491020dfb01f74967e0f830daed84fa0df9273b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Tue, 6 Sep 2022 13:12:56 +0800 Subject: [PATCH] - update gin - update api --- api.go | 9 +++------ api_gorm.go | 21 ++++++++++++++++++--- api_mongo.go | 21 ++++++++++++++++++--- const.go | 2 +- gin.go | 8 ++++---- gin_gorm.go | 34 +++++++++++++++++++++------------- gin_mongo.go | 26 +++++++++++++++++--------- system.go | 33 --------------------------------- 8 files changed, 82 insertions(+), 72 deletions(-) delete mode 100644 system.go diff --git a/api.go b/api.go index 28fd12d..ff05c17 100644 --- a/api.go +++ b/api.go @@ -15,12 +15,12 @@ type ApiClient struct { gormClient *dorm.GormClient // 数据库驱动 mongoClient *dorm.MongoClient // 数据库驱动 zapLog *ZapLog // 日志服务 + logDebug bool // 日志开关 gormConfig struct { tableName string // 表名 insideIp string // 内网ip hostname string // 主机名 goVersion string // go版本 - debug bool // 日志开关 } mongoConfig struct { databaseName string // 库名 @@ -28,7 +28,6 @@ type ApiClient struct { insideIp string // 内网ip hostname string // 主机名 goVersion string // go版本 - debug bool // 日志开关 } log struct { gorm bool // 日志开关 @@ -64,6 +63,8 @@ func NewApiClient(config *ApiClientConfig) (*ApiClient, error) { c.zapLog = config.ZapLog + c.logDebug = config.Debug + gormClient, gormTableName := config.GormClientFun() mongoClient, mongoDatabaseName, mongoCollectionName := config.MongoClientFun() @@ -82,8 +83,6 @@ func NewApiClient(config *ApiClientConfig) (*ApiClient, error) { } c.gormConfig.tableName = gormTableName - c.gormConfig.debug = config.Debug - err := c.gormAutoMigrate() if err != nil { return nil, errors.New("创建表失败：" + err.Error()) @@ -111,8 +110,6 @@ func NewApiClient(config *ApiClientConfig) (*ApiClient, error) { } c.mongoConfig.collectionName = mongoCollectionName - c.mongoConfig.debug = config.Debug - c.mongoConfig.hostname = hostname c.mongoConfig.insideIp = goip.GetInsideIp(ctx) c.mongoConfig.goVersion = runtime.Version() diff --git a/api_gorm.go b/api_gorm.go index feddca1..5ca7ebb 100644 --- a/api_gorm.go +++ b/api_gorm.go @@ -34,6 +34,8 @@ func NewApiGormClient(config *ApiGormClientConfig) (*ApiClient, error) { c.zapLog = config.ZapLog + c.logDebug = config.Debug + client, tableName := config.GormClientFun() if client == nil || client.Db == nil { @@ -47,8 +49,6 @@ func NewApiGormClient(config *ApiGormClientConfig) (*ApiClient, error) { } c.gormConfig.tableName = tableName - c.gormConfig.debug = config.Debug - err := c.gormAutoMigrate() if err != nil { return nil, errors.New("创建表失败：" + err.Error()) @@ -112,7 +112,7 @@ func (c *ApiClient) gormRecord(ctx context.Context, postgresqlLog apiPostgresqlL err = c.gormClient.Db.Table(c.gormConfig.tableName).Create(&postgresqlLog).Error if err != nil { - c.zapLog.WithLogger().Sugar().Errorf("[golog.api.gormRecord]：%s", err) + c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.gormRecord]：%s", err) } return @@ -149,6 +149,11 @@ func (c *ApiClient) GormMiddleware(ctx context.Context, request gorequest.Respon c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddleware.len]：%s %s", data.RequestUri, request.ResponseBody) } } + + if c.logDebug { + c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddleware.data]：%+v", data) + } + err := c.gormRecord(ctx, data) if err != nil { c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.GormMiddleware]：%s", err.Error()) @@ -180,6 +185,11 @@ func (c *ApiClient) GormMiddlewareXml(ctx context.Context, request gorequest.Res c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareXml.len]：%s %s", data.RequestUri, request.ResponseBody) } } + + if c.logDebug { + c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareXml.data]：%+v", data) + } + err := c.gormRecord(ctx, data) if err != nil { c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.GormMiddlewareXml]：%s", err.Error()) @@ -212,6 +222,11 @@ func (c *ApiClient) GormMiddlewareCustom(ctx context.Context, api string, reques c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareCustom.len]：%s %s", data.RequestUri, request.ResponseBody) } } + + if c.logDebug { + c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.GormMiddlewareCustom.data]：%+v", data) + } + err := c.gormRecord(ctx, data) if err != nil { c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.GormMiddlewareCustom]：%s", err.Error()) diff --git a/api_mongo.go b/api_mongo.go index e331ab4..4ce90cb 100644 --- a/api_mongo.go +++ b/api_mongo.go @@ -35,6 +35,8 @@ func NewApiMongoClient(config *ApiMongoClientConfig) (*ApiClient, error) { c.zapLog = config.ZapLog + c.logDebug = config.Debug + client, databaseName, collectionName := config.MongoClientFun() if client == nil || client.Db == nil { @@ -53,8 +55,6 @@ func NewApiMongoClient(config *ApiMongoClientConfig) (*ApiClient, error) { } c.mongoConfig.collectionName = collectionName - c.mongoConfig.debug = config.Debug - hostname, _ := os.Hostname() c.mongoConfig.hostname = hostname @@ -154,7 +154,7 @@ func (c *ApiClient) mongoRecord(ctx context.Context, mongoLog apiMongolLog) (err _, 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) + c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.mongoRecord]：%s", err) } return err @@ -190,6 +190,11 @@ func (c *ApiClient) MongoMiddleware(ctx context.Context, request gorequest.Respo c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddleware.len]：%s %s", data.RequestUri, request.ResponseBody) } } + + if c.logDebug { + c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddleware.data]：%+v", data) + } + err := c.mongoRecord(ctx, data) if err != nil { c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.MongoMiddleware]：%s", err.Error()) @@ -221,6 +226,11 @@ func (c *ApiClient) MongoMiddlewareXml(ctx context.Context, request gorequest.Re c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareXml]：%s %s", data.RequestUri, request.ResponseBody) } } + + if c.logDebug { + c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareXml.data]：%+v", data) + } + err := c.mongoRecord(ctx, data) if err != nil { c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.MongoMiddlewareXml]：%s", err.Error()) @@ -252,6 +262,11 @@ func (c *ApiClient) MongoMiddlewareCustom(ctx context.Context, api string, reque c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.MongoMiddlewareCustom]：%s %s", data.RequestUri, request.ResponseBody) } } + + if c.logDebug { + c.zapLog.WithTraceId(ctx).Sugar().Infof("[golog.api.mongoRecordJson.data]：%+v", data) + } + err := c.mongoRecord(ctx, data) if err != nil { c.zapLog.WithTraceId(ctx).Sugar().Errorf("[golog.api.MongoMiddlewareCustom]：%s", err.Error()) diff --git a/const.go b/const.go index 02de76e..fca0c82 100644 --- a/const.go +++ b/const.go @@ -1,5 +1,5 @@ package golog const ( - Version = "1.0.65" + Version = "1.0.66" ) diff --git a/gin.go b/gin.go index 39a526c..1126b71 100644 --- a/gin.go +++ b/gin.go @@ -232,12 +232,12 @@ func (c *GinClient) Middleware() gin.HandlerFunc { 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) + c.gormRecordJson(ginCtx, traceId, requestTime, 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) + c.gormRecordXml(ginCtx, traceId, requestTime, data, responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp) } } // 记录 @@ -246,12 +246,12 @@ func (c *GinClient) Middleware() gin.HandlerFunc { 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) + c.mongoRecordJson(ginCtx, traceId, requestTime, 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) + c.mongoRecordXml(ginCtx, traceId, requestTime, data, responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp) } } }() diff --git a/gin_gorm.go b/gin_gorm.go index 0a1d7fb..10d6784 100644 --- a/gin_gorm.go +++ b/gin_gorm.go @@ -128,13 +128,13 @@ func (c *GinClient) gormRecord(postgresqlLog ginPostgresqlLog) (err error) { err = c.gormClient.Db.Table(c.gormConfig.tableName).Create(&postgresqlLog).Error if err != nil { - c.zapLog.WithLogger().Sugar().Errorf("[golog.gin.gormRecord]：%s", err) + c.zapLog.WithTraceIdStr(postgresqlLog.TraceId).Sugar().Errorf("[golog.gin.gormRecord]：%s", err) } return } -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) { +func (c *GinClient) gormRecordJson(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody []byte, 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) @@ -170,10 +170,14 @@ func (c *GinClient) gormRecordJson(ginCtx *gin.Context, traceId string, requestT } if len(requestBody) > 0 { - data.RequestBody = datatypes.JSON(requestBody) //【请求】请求主体 + data.RequestBody = requestBody //【请求】请求主体 data.RequestContent = dorm.JsonEncodeNoError(requestBody) //【请求】请求内容 } else { - c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordJson.len]：%s %s", data.RequestUri, requestBody) + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordJson.len]：%s，%s", data.RequestUri, requestBody) + } + + if c.logDebug { + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordJson.data]：%+v", data) } err := c.gormRecord(data) @@ -186,7 +190,7 @@ func (c *GinClient) gormRecordJson(ginCtx *gin.Context, traceId string, requestT } } -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) { +func (c *GinClient) gormRecordXml(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody []byte, 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) @@ -222,9 +226,13 @@ func (c *GinClient) gormRecordXml(ginCtx *gin.Context, traceId string, requestTi } if len(requestBody) > 0 { - data.RequestContent = dorm.XmlEncodeNoError(dorm.XmlDecodeNoError([]byte(requestBody))) //【请求】请求内容 + data.RequestContent = dorm.XmlEncodeNoError(dorm.XmlDecodeNoError(requestBody)) //【请求】请求内容 } else { - c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordXml.len]：%s %s", data.RequestUri, requestBody) + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordXml.len]：%s，%s", data.RequestUri, requestBody) + } + + if c.logDebug { + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.gormRecordXml.data]：%+v", data) } err := c.gormRecord(data) @@ -232,10 +240,10 @@ func (c *GinClient) gormRecordXml(ginCtx *gin.Context, traceId string, requestTi 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)))) + c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlDecodeNoError.string]：%s", dorm.XmlDecodeNoError(requestBody)) + c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlDecodeNoError.value]：%+v", dorm.XmlDecodeNoError(requestBody)) + c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlEncodeNoError.string]：%s", dorm.XmlEncodeNoError(dorm.XmlDecodeNoError(requestBody))) + c.zapLog.WithTraceIdStr(traceId).Sugar().Errorf("[golog.gin.gormRecordXml.XmlEncodeNoError.value]：%+v", dorm.XmlEncodeNoError(dorm.XmlDecodeNoError(requestBody))) } } @@ -320,12 +328,12 @@ func (c *GinClient) GormMiddleware() gin.HandlerFunc { 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) + c.gormRecordJson(ginCtx, traceId, requestTime, 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) + c.gormRecordXml(ginCtx, traceId, requestTime, data, responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp) } } }() diff --git a/gin_mongo.go b/gin_mongo.go index 21bdfba..3de8195 100644 --- a/gin_mongo.go +++ b/gin_mongo.go @@ -212,13 +212,13 @@ func (c *GinClient) mongoRecord(mongoLog ginMongoLog) (err error) { _, 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) + c.zapLog.WithTraceIdStr(mongoLog.TraceId).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) { +func (c *GinClient) mongoRecordJson(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody []byte, 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) @@ -253,9 +253,13 @@ func (c *GinClient) mongoRecordJson(ginCtx *gin.Context, traceId string, request } if len(requestBody) > 0 { - data.RequestBody = dorm.JsonDecodeNoError([]byte(requestBody)) //【请求】请求主体 + data.RequestBody = dorm.JsonDecodeNoError(requestBody) //【请求】请求主体 } else { - c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordJson.len]：%s %s", data.RequestUri, requestBody) + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordJson.len]：%s，%s", data.RequestUri, requestBody) + } + + if c.logDebug { + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordJson.data]：%+v", data) } err := c.mongoRecord(data) @@ -264,7 +268,7 @@ func (c *GinClient) mongoRecordJson(ginCtx *gin.Context, traceId string, request } } -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) { +func (c *GinClient) mongoRecordXml(ginCtx *gin.Context, traceId string, requestTime time.Time, requestBody []byte, 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) @@ -299,9 +303,13 @@ func (c *GinClient) mongoRecordXml(ginCtx *gin.Context, traceId string, requestT } if len(requestBody) > 0 { - data.RequestBody = dorm.XmlDecodeNoError([]byte(requestBody)) //【请求】请求主体 + data.RequestBody = dorm.XmlDecodeNoError(requestBody) //【请求】请求主体 } else { - c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordXml.len]：%s %s", data.RequestUri, requestBody) + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordXml.len]：%s，%s", data.RequestUri, requestBody) + } + + if c.logDebug { + c.zapLog.WithTraceIdStr(traceId).Sugar().Infof("[golog.gin.mongoRecordXml.data]：%+v", data) } err := c.mongoRecord(data) @@ -391,12 +399,12 @@ func (c *GinClient) MongoMiddleware() gin.HandlerFunc { 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) + c.mongoRecordJson(ginCtx, traceId, requestTime, 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) + c.mongoRecordXml(ginCtx, traceId, requestTime, data, responseCode, responseBody, startTime, endTime, clientIp, requestClientIpCountry, requestClientIpRegion, requestClientIpProvince, requestClientIpCity, requestClientIpIsp) } } }() diff --git a/system.go b/system.go deleted file mode 100644 index 41af3f5..0000000 --- a/system.go +++ /dev/null @@ -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 -}