Compare commits

...

3 Commits

Author SHA1 Message Date
yuguojian
33e119864e 日志参数转字符串 2025-07-14 15:26:10 +08:00
yuguojian
f6a41a5e7c 日志参数转字符串 2025-07-14 14:51:05 +08:00
yuguojian
994ed9e639 更新日志 2025-07-11 00:20:34 +08:00
2 changed files with 79 additions and 24 deletions

View File

@@ -0,0 +1,75 @@
{
"settings": {
"index": {
"mapping": {
"source": {
"mode": "synthetic"
}
}
}
},
"mappings": {
"properties": {
"caller": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"created_at": {
"type": "date",
"format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis||epoch_second"
},
"level": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"log": {
"properties": {
"at": {
"type": "date",
"format": "yyyy-MM-dd HH:mm:ss||yyyy-MM-dd||epoch_millis||epoch_second"
},
"log_type": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"param": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"result": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
},
"title": {
"type": "text",
"fields": {
"keyword": {
"type": "keyword"
}
}
}
}
}
}
}
}

View File

@@ -3,10 +3,8 @@ package log
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/dromara/carbon/v2"
"github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/frame/g"
"go.uber.org/zap" "go.uber.org/zap"
"reflect"
) )
type LogType = string type LogType = string
@@ -49,9 +47,6 @@ type LogInfo struct {
Title string `json:"title"` // 必填,标题,做什么事情 Title string `json:"title"` // 必填,标题,做什么事情
Param interface{} `json:"param,omitempty"` // 参数,请求参数,传指针 Param interface{} `json:"param,omitempty"` // 参数,请求参数,传指针
Result interface{} `json:"result,omitempty"` // 结果返回值传指针如果是报错传err Result interface{} `json:"result,omitempty"` // 结果返回值传指针如果是报错传err
ErrStr string `json:"err_str,omitempty"` // 错误信息,不用传入,自动记录
At string `json:"at"` // 记录时间,不用传入,自动记录
Timestamp int64 `json:"timestamp"` // 时间戳,不用传入,自动记录
} }
type param struct { type param struct {
@@ -95,18 +90,10 @@ func ZapFatal(logger *zap.Logger, log *LogInfo) {
} }
func HandleLog(log *LogInfo) { func HandleLog(log *LogInfo) {
log.At = carbon.Now().ToDateTimeString()
log.Timestamp = carbon.Now().Timestamp()
// 处理 Param
// 处理 Param // 处理 Param
log.Param = processValue(log.Param) log.Param = processValue(log.Param)
// 处理 Result // 处理 Result
if _, ok := log.Result.(error); ok { log.Result = processValue(log.Result)
log.ErrStr = fmt.Sprintf("%+v", log.Result)
log.Result = struct{}{}
} else {
log.Result = processValue(log.Result)
}
} }
func GFInfo(ctx context.Context, log *LogInfo) { func GFInfo(ctx context.Context, log *LogInfo) {
@@ -161,15 +148,8 @@ func (l *LogInfo) ZapCommonHandelResult(logger *zap.Logger, result interface{},
func processValue(value interface{}) interface{} { func processValue(value interface{}) interface{} {
if value == nil { if value == nil {
return struct{}{} return ""
}
kind := reflect.TypeOf(value).Kind()
switch kind {
case reflect.Map, reflect.Slice, reflect.Array, reflect.Struct:
// 如果是复杂类型,保持原样
return value
default:
// 对于其他类型,转换为字符串
return param{Type: kind.String(), Value: fmt.Sprintf("%v", value)}
} }
// 对于其他类型,转换为字符串
return fmt.Sprintf("%+v", value)
} }