调整日志操作人类型命名

go.mod

@@ -3,8 +3,9 @@ module git.ssgfgtfy.com/public/common_structure
 go 1.18.0
 
 require (
-	github.com/dromara/carbon/v2 v2.6.4 // indirect
+	github.com/dromara/carbon/v2 v2.6.4
-	github.com/golang-module/carbon/v2 v2.5.9 // indirect
+	go.uber.org/zap v1.27.0
-	go.uber.org/multierr v1.10.0 // indirect
+	github.com/gogf/gf/v2 v2.7.2
-	go.uber.org/zap v1.27.0 // indirect
 )
+
+require go.uber.org/multierr v1.10.0 // indirect

go.sum

@@ -1,8 +1,12 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/dromara/carbon/v2 v2.6.4 h1:cpIansyiEIEed3OlEIqo1IXj86qu0x6pf/E2keL2wYo=
 github.com/dromara/carbon/v2 v2.6.4/go.mod h1:Baj3A1uBBctJmpZWJd6/+WWnmIuY2pobR6IOpB6xigc=
-github.com/golang-module/carbon/v2 v2.5.9 h1:QKotfr6/Fkk5RGIPyEfItaR5guF37QH2YyKCbn1EFxM=
+github.com/gogf/gf/v2 v2.7.2/go.mod h1:EBXneAg/wes86rfeh68XC0a2JBNQylmT7Sp6/8Axk88=
-github.com/golang-module/carbon/v2 v2.5.9/go.mod h1:yAYXIP0OIq7ykDosUWpZpEyTGuvBXnSjGMQ/EaNagYQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

log/log.go

@@ -1,9 +1,10 @@
-package common_structure
+package log
 
 import (
+	"context"
 	"fmt"
-
 	"github.com/dromara/carbon/v2"
+	"github.com/gogf/gf/v2/frame/g"
 	"go.uber.org/zap"
 )
 
@@ -18,6 +19,7 @@ const (
 	LogTypeUser         LogType = "user"          // 用户
 	LogTypeGPS          LogType = "gps"           // gps
 	LogTypeSMS          LogType = "sms"           // 短信
+	LogTypeIP           LogType = "ip"            // ip信息
 	LogTypeSystem       LogType = "system"        // 系统、日志、定时任务初始化、定时任务、mq初始化等
 )
 
@@ -28,16 +30,16 @@ type LogInfo struct {
 	Title      string      `json:"title"`                 // 必填，标题，做什么事情
 	Param      interface{} `json:"param,omitempty"`       // 参数，请求参数，传指针
 	Result     interface{} `json:"result,omitempty"`      // 结果，返回值，传指针，如果是报错，传err
-	ErrStr     string      `json:"err_str,omitempty"`     // 错误信息
+	ErrStr     string      `json:"err_str,omitempty"`     // 错误信息，不用传入，自动记录
 	At         string      `json:"at"`                    // 记录时间，不用传入，自动记录
 }
 
 type OperatorType = string
 
 const (
-	AdminOperatorType    OperatorType = "admin"    // 管理员
+	OperatorTypeAdmin    OperatorType = "admin"    // 管理员
-	MerchantOperatorType OperatorType = "merchant" // 商家
+	OperatorTypeMerchant OperatorType = "merchant" // 商家
-	UserOperatorType     OperatorType = "user"     // 用户
+	OperatorTypeUser     OperatorType = "user"     // 用户
 )
 
 type Operator struct {
@@ -45,9 +47,9 @@ type Operator struct {
 	OperatorType OperatorType
 }
 
-func ZapPanic(logger *zap.Logger, log *LogInfo) {
+func ZapDebug(logger *zap.Logger, log *LogInfo) {
 	handleLog(log)
-	logger.Panic("", zap.Any("log", log))
+	logger.Debug("", zap.Any("log", log))
 }
 
 func ZapInfo(logger *zap.Logger, log *LogInfo) {
@@ -55,11 +57,26 @@ func ZapInfo(logger *zap.Logger, log *LogInfo) {
 	logger.Info("", zap.Any("log", log))
 }
 
+func ZapWarn(logger *zap.Logger, log *LogInfo) {
+	handleLog(log)
+	logger.Warn("", zap.Any("log", log))
+}
+
 func ZapError(logger *zap.Logger, log *LogInfo) {
 	handleLog(log)
 	logger.Error("", zap.Any("log", log))
 }
 
+func ZapPanic(logger *zap.Logger, log *LogInfo) {
+	handleLog(log)
+	logger.Panic("", zap.Any("log", log))
+}
+
+func ZapFatal(logger *zap.Logger, log *LogInfo) {
+	handleLog(log)
+	logger.Fatal("", zap.Any("log", log))
+}
+
 func handleLog(log *LogInfo) {
 	log.At = carbon.Now().ToDateTimeString()
 	if _, ok := log.Result.(error); ok {
@@ -67,3 +84,53 @@ func handleLog(log *LogInfo) {
 		log.Result = nil
 	}
 }
+
+func GFInfo(ctx context.Context, log *LogInfo) {
+	handleLog(log)
+	g.Log().Info(ctx, log)
+}
+
+func GFWarning(ctx context.Context, log *LogInfo) {
+	handleLog(log)
+	g.Log().Warning(ctx, log)
+}
+
+func GFError(ctx context.Context, log *LogInfo) {
+	handleLog(log)
+	g.Log().Error(ctx, log)
+}
+
+func GFDebug(ctx context.Context, log *LogInfo) {
+	handleLog(log)
+	g.Log().Debug(ctx, log)
+}
+
+func GFPanic(ctx context.Context, log *LogInfo) {
+	handleLog(log)
+	g.Log().Panic(ctx, log)
+}
+
+func GFFatal(ctx context.Context, log *LogInfo) {
+	handleLog(log)
+	g.Log().Fatal(ctx, log)
+}
+
+func (l *LogInfo) GFCommonHandelResult(ctx context.Context, result interface{}, err error) {
+	if err != nil {
+		l.Result = err
+		GFError(ctx, l)
+	} else {
+		l.Result = result
+		GFInfo(ctx, l)
+	}
+}
+
+func (l *LogInfo) ZapCommonHandelResult(logger *zap.Logger, result interface{}, err error) {
+	if err != nil {
+		l.Result = err
+		ZapError(logger, l)
+	} else {
+		l.Result = result
+		ZapInfo(logger, l)
+	}
+}

rabbitmq_coupon.go

@@ -0,0 +1,5 @@
+package common_structure
+
+type CouponCode struct {
+	ID uint `json:"id"` // 优惠券ID
+}

rabbitmq_red_packet.go

@@ -0,0 +1,5 @@
+package common_structure
+
+type GiveRedPacketTask struct {
+	TaskID uint `json:"task_id"` // 任务ID
+}