diff --git a/log/elasticsearch_map.go b/log/elasticsearch_map.go deleted file mode 100644 index d1d6755..0000000 --- a/log/elasticsearch_map.go +++ /dev/null @@ -1,85 +0,0 @@ -package log - -type T struct { - Mappings Mappings `json:"mappings"` -} - -type Mappings struct { - Properties Properties `json:"properties"` -} - -type Properties struct { - Caller Caller `json:"caller"` - CreatedAt CreatedAt `json:"created_at"` - Level Level `json:"level"` - Log Log `json:"log"` -} - -type Caller struct { - Type string `json:"type"` - Fields struct { - Keyword struct { - Type string `json:"type"` - IgnoreAbove int `json:"ignore_above"` - } `json:"keyword"` - } `json:"fields"` -} - -type CreatedAt struct { - Type string `json:"type"` - Fields struct { - Keyword struct { - Type string `json:"type"` - IgnoreAbove int `json:"ignore_above"` - } `json:"keyword"` - } `json:"fields"` -} - -type Level struct { - Type string `json:"type"` - Fields struct { - Keyword struct { - Type string `json:"type"` - IgnoreAbove int `json:"ignore_above"` - } `json:"keyword"` - } `json:"fields"` -} - -type Log struct { - Properties struct { - At struct { - Type string `json:"type"` - Fields struct { - Keyword struct { - Type string `json:"type"` - IgnoreAbove int `json:"ignore_above"` - } `json:"keyword"` - } `json:"fields"` - } `json:"at"` - LogType struct { - Type string `json:"type"` - Fields struct { - Keyword struct { - Type string `json:"type"` - IgnoreAbove int `json:"ignore_above"` - } `json:"keyword"` - } `json:"fields"` - } `json:"log_type"` - Param struct { - } `json:"param"` - Result struct { - } `json:"result"` - Timestamp struct { - Type string `json:"type"` - } `json:"timestamp"` - Title struct { - Type string `json:"type"` - Fields struct { - Keyword struct { - Type string `json:"type"` - IgnoreAbove int `json:"ignore_above"` - } `json:"keyword"` - } `json:"fields"` - } `json:"title"` - } `json:"properties"` -} diff --git a/log/elasticsearch_map.json b/log/elasticsearch_map.json new file mode 100644 index 0000000..7b3ec9c --- /dev/null +++ b/log/elasticsearch_map.json @@ -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" + } + } + } + } + } + } + } +} \ No newline at end of file diff --git a/log/log.go b/log/log.go index 4bd9711..9408a08 100644 --- a/log/log.go +++ b/log/log.go @@ -6,7 +6,6 @@ import ( "github.com/dromara/carbon/v2" "github.com/gogf/gf/v2/frame/g" "go.uber.org/zap" - "reflect" ) type LogType = string @@ -98,7 +97,6 @@ func HandleLog(log *LogInfo) { log.At = carbon.Now().ToDateTimeString() log.Timestamp = carbon.Now().Timestamp() // 处理 Param - // 处理 Param log.Param = processValue(log.Param) // 处理 Result if _, ok := log.Result.(error); ok { @@ -161,15 +159,8 @@ func (l *LogInfo) ZapCommonHandelResult(logger *zap.Logger, result interface{}, func processValue(value interface{}) interface{} { if value == nil { - return struct{}{} - } - 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 "" } + // 对于其他类型,转换为字符串 + return fmt.Sprintf("%+v", value) }