更新日志

log/elasticsearch_map.json

@@ -1,75 +0,0 @@
-{
-  "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"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

log/log.go

@@ -3,8 +3,7 @@ package log
 import (
 	"context"
 	"fmt"
-	"github.com/dromara/carbon/v2"
+	"github.com/gogf/gf/v2/os/glog"
-	"github.com/gogf/gf/v2/frame/g"
 	"go.uber.org/zap"
 )
 
@@ -37,8 +36,8 @@ const (
 )
 
 type Operator struct {
-	ID           int // 系统ID设置0
+	ID           int          `json:"id"` // 系统ID设置0
-	OperatorType OperatorType
+	OperatorType OperatorType `json:"operator_type"`
 }
 
 type LogInfo struct {
@@ -48,19 +47,20 @@ type LogInfo struct {
 	Title      string      `json:"title"`                 // 必填，标题，做什么事情
 	Param      interface{} `json:"param,omitempty"`       // 参数，请求参数，传指针
 	Result     interface{} `json:"result,omitempty"`      // 结果，返回值，传指针，如果是报错，传err
-	ErrStr     string      `json:"err_str,omitempty"`     // 错误信息，不用传入，自动记录
-	At         string      `json:"at"`                    // 记录时间，不用传入，自动记录
-	Timestamp  int64       `json:"timestamp"`             // 时间戳，不用传入，自动记录
 }
 
-type param struct {
+type TempGLog struct {
-	Type  string      `json:"type"`
+	Time    string `json:"Time"`
-	Value interface{} `json:"value"`
+	TraceId string `json:"TraceId"`
+	Level   string `json:"Level"`
+	Content string `json:"Content"`
 }
 
-type result struct {
+type GLog struct {
-	Type  string      `json:"type"`
+	Time    string   `json:"Time"`
-	Value interface{} `json:"value"`
+	TraceId string   `json:"TraceId"`
+	Level   string   `json:"Level"`
+	Content *LogInfo `json:"Content"`
 }
 
 func ZapDebug(logger *zap.Logger, log *LogInfo) {
@@ -94,56 +94,49 @@ func ZapFatal(logger *zap.Logger, log *LogInfo) {
 }
 
 func HandleLog(log *LogInfo) {
-	log.At = carbon.Now().ToDateTimeString()
-	log.Timestamp = carbon.Now().Timestamp()
 	// 处理 Param
 	log.Param = processValue(log.Param)
 	// 处理 Result
-	if _, ok := log.Result.(error); ok {
-		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, g *glog.Logger, log *LogInfo) {
 	HandleLog(log)
-	g.Log().Info(ctx, log)
+	g.Info(ctx, log)
 }
 
-func GFWarning(ctx context.Context, log *LogInfo) {
+func GFWarning(ctx context.Context, g *glog.Logger, log *LogInfo) {
 	HandleLog(log)
-	g.Log().Warning(ctx, log)
+	g.Warning(ctx, log)
 }
 
-func GFError(ctx context.Context, log *LogInfo) {
+func GFError(ctx context.Context, g *glog.Logger, log *LogInfo) {
 	HandleLog(log)
-	g.Log().Error(ctx, log)
+	g.Error(ctx, log)
 }
 
-func GFDebug(ctx context.Context, log *LogInfo) {
+func GFDebug(ctx context.Context, g *glog.Logger, log *LogInfo) {
 	HandleLog(log)
-	g.Log().Debug(ctx, log)
+	g.Debug(ctx, log)
 }
 
-func GFPanic(ctx context.Context, log *LogInfo) {
+func GFPanic(ctx context.Context, g *glog.Logger, log *LogInfo) {
 	HandleLog(log)
-	g.Log().Panic(ctx, log)
+	g.Panic(ctx, log)
 }
 
-func GFFatal(ctx context.Context, log *LogInfo) {
+func GFFatal(ctx context.Context, g *glog.Logger, log *LogInfo) {
 	HandleLog(log)
-	g.Log().Fatal(ctx, log)
+	g.Fatal(ctx, log)
 }
 
-func (l *LogInfo) GFCommonHandelResult(ctx context.Context, result interface{}, err error) {
+func (l *LogInfo) GFCommonHandelResult(ctx context.Context, g *glog.Logger, result interface{}, err error) {
 	if err != nil {
 		l.Result = err
-		GFError(ctx, l)
+		GFError(ctx, g, l)
 	} else {
 		l.Result = result
-		GFInfo(ctx, l)
+		GFInfo(ctx, g, l)
 	}
 }
 
@@ -161,6 +154,5 @@ func processValue(value interface{}) interface{} {
 	if value == nil {
 		return ""
 	}
-	// 对于其他类型，转换为字符串
 	return fmt.Sprintf("%+v", value)
 }