更新2.1.2版本，优化部门、角色权限，增加上下级关系；增加登录、系统、短信日志;优化省市区编码

server/internal/library/queue/init.go

@@ -93,7 +93,7 @@ func InstanceProducer() (mqClient MqProducer, err error) {
 	return NewProducer(config.GroupName)
 }
 
-// NewProducer 新建一个生产者实例
+// NewProducer 初始化生产者实例
 func NewProducer(groupName string) (mqClient MqProducer, err error) {
 	if item, ok := mqProducerInstanceMap[groupName]; ok {
 		return item, nil
@@ -143,7 +143,7 @@ func NewProducer(groupName string) (mqClient MqProducer, err error) {
 	return mqClient, nil
 }
 
-// NewConsumer 新建一个消费者实例
+// NewConsumer 初始化消费者实例
 func NewConsumer(groupName string) (mqClient MqConsumer, err error) {
 	randTag := string(charset.RandomCreateBytes(6))
 

server/internal/library/queue/kafkamq.go

@@ -87,30 +87,28 @@ func (r *KafkaMq) ListenReceiveMsgDo(topic string, receiveDo func(mqMsg MqMsg))
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
-
-	go func() {
-
+	go func(ctx context.Context) {
 		for {
 			if err := r.consumerIns.Consume(ctx, []string{topic}, &consumer); err != nil {
-				FatalLog(ctx, "kafka Error from consumer", err)
+				g.Log().Fatalf(ctx, "kafka Error from consumer, err%+v", err)
 			}
 
 			if ctx.Err() != nil {
-				Log(ctx, fmt.Sprintf("kafka consoumer stop : %v", ctx.Err()))
+				g.Log().Debugf(ctx, fmt.Sprintf("kafka consoumer stop : %v", ctx.Err()))
 				return
 			}
 			consumer.ready = make(chan bool)
 		}
-	}()
+	}(ctx)
 
 	<-consumer.ready // Await till the consumer has been set up
-	Log(ctx, "kafka consumer up and running!...")
+	g.Log().Debug(ctx, "kafka consumer up and running!...")
 
 	signal.AppDefer(func() {
-		Log(ctx, "kafka consumer close...")
+		g.Log().Debug(ctx, "kafka consumer close...")
 		cancel()
 		if err = r.consumerIns.Close(); err != nil {
-			FatalLog(ctx, "kafka Error closing client", err)
+			g.Log().Fatalf(ctx, "kafka Error closing client, err:%+v", err)
 		}
 	})
 
@@ -193,7 +191,7 @@ func RegisterKafkaProducer(connOpt KafkaConfig, mqIns *KafkaMq) {
 	}
 
 	signal.AppDefer(func() {
-		Log(ctx, "kafka producer AsyncClose...")
+		g.Log().Debug(ctx, "kafka producer AsyncClose...")
 		mqIns.producerIns.AsyncClose()
 	})
 }

server/internal/library/queue/logger.go

@@ -10,33 +10,28 @@ import (
 	"context"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
-	"hotgo/internal/consts"
+	"hotgo/utility/charset"
+)
+
+const (
+	ConsumerLogErrFormat = "消费 [%s] 失败, mqMsgId:%+v, mqMsgData:%+v, err:%+v, stack:%+v"
+	ProducerLogErrFormat = "生产 [%s] 失败, data:%+v, err:%+v, stack:%+v"
 )
 
 // ConsumerLog 消费日志
 func ConsumerLog(ctx context.Context, topic string, mqMsg MqMsg, err error) {
 	if err != nil {
-		g.Log(consts.QueueLogPath).Error(ctx, "消费 ["+topic+"] 失败", mqMsg, err)
+		g.Log().Printf(ctx, ConsumerLogErrFormat, topic, mqMsg.MsgId, mqMsg.BodyString(), err, charset.ParseErrStack(err))
 	} else {
-		g.Log(consts.QueueLogPath).Debug(ctx, "消费 ["+topic+"] 成功", mqMsg.MsgId)
+		g.Log().Print(ctx, "消费 ["+topic+"] 成功", mqMsg.MsgId)
 	}
 }
 
 // ProducerLog 生产日志
 func ProducerLog(ctx context.Context, topic string, data interface{}, err error) {
 	if err != nil {
-		g.Log(consts.QueueLogPath).Error(ctx, "生产 ["+topic+"] 失败", gconv.String(data))
+		g.Log().Printf(ctx, ProducerLogErrFormat, topic, gconv.String(data), err, charset.ParseErrStack(err))
 	} else {
-		g.Log(consts.QueueLogPath).Debug(ctx, "生产 ["+topic+"] 成功", gconv.String(data))
+		g.Log().Print(ctx, "生产 ["+topic+"] 成功", gconv.String(data))
 	}
 }
-
-// FatalLog 致命日志
-func FatalLog(ctx context.Context, text string, err error) {
-	g.Log(consts.QueueLogPath).Fatal(ctx, text+":", err)
-}
-
-// Log 通用日志
-func Log(ctx context.Context, text string) {
-	g.Log(consts.QueueLogPath).Debug(ctx, text)
-}

server/internal/library/queue/push.go

@@ -0,0 +1,18 @@
+package queue
+
+import (
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/util/gconv"
+)
+
+// Push 推送队列
+func Push(topic string, data interface{}) (err error) {
+	q, err := InstanceProducer()
+	if err != nil {
+		g.Log().Fatalf(ctx, "queue.InstanceProducer err:%+v", err)
+		return err
+	}
+	mqMsg, err := q.SendMsg(topic, gconv.String(data))
+	ProducerLog(ctx, topic, mqMsg.MsgId, err)
+	return err
+}

server/internal/library/queue/redismq.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gomodule/redigo/redis"
-	"hotgo/internal/consts"
 	"hotgo/utility/encrypt"
 	"math/rand"
 	"time"
@@ -113,7 +112,7 @@ func (r *RedisMq) ListenReceiveMsgDo(topic string, receiveDo func(mqMsg MqMsg))
 
 // 生成队列名称
 func (r *RedisMq) genQueueName(groupName string, topic string) string {
-	return fmt.Sprintf(consts.QueueName+"%s_%s", groupName, topic)
+	return fmt.Sprintf("queue:%s_%s", groupName, topic)
 }
 
 func (r *RedisMq) loopReadQueue(queueName string) (mqMsgList []MqMsg) {

server/internal/library/queue/rocketmq.go

@@ -26,8 +26,8 @@ type RocketMq struct {
 
 // rewriteLog 重写日志
 func rewriteLog() {
-	level := g.Cfg().MustGet(ctx, "queue.rocketmq.logLevel", "debug")
-	rlog.SetLogger(&RocketMqLogger{Flag: "[rocket_mq]", LevelLog: level.String()})
+	level := g.Cfg().MustGet(ctx, "queue.rocketmq.logLevel", "debug").String()
+	rlog.SetLogger(&RocketMqLogger{Flag: "[rocket_mq]", LevelLog: level})
 }
 
 // RegisterRocketProducerMust 注册并启动生产者接口实现

server/internal/library/queue/rocketmq_logger.go

@@ -7,7 +7,7 @@
 package queue
 
 import (
-	"fmt"
+	"github.com/gogf/gf/v2/frame/g"
 )
 
 type RocketMqLogger struct {
@@ -24,16 +24,16 @@ func (l *RocketMqLogger) Debug(msg string, fields map[string]interface{}) {
 	}
 
 	if l.LevelLog == "debug" || l.LevelLog == "all" {
-		Log(ctx, fmt.Sprint(l.Flag, " [debug] ", msg))
+		g.Log().Debug(ctx, msg)
 	}
 }
 
 func (l *RocketMqLogger) Level(level string) {
-	Log(ctx, fmt.Sprint(l.Flag, " [level] ", level))
+	g.Log().Info(ctx, level)
 }
 
 func (l *RocketMqLogger) OutputPath(path string) (err error) {
-	Log(ctx, fmt.Sprint(l.Flag, " [path] ", path))
+	g.Log().Info(ctx, path)
 	return nil
 }
 
@@ -46,7 +46,7 @@ func (l *RocketMqLogger) Info(msg string, fields map[string]interface{}) {
 	}
 
 	if l.LevelLog == "info" || l.LevelLog == "all" {
-		Log(ctx, fmt.Sprint(l.Flag, " [info] ", msg))
+		g.Log().Info(ctx, msg)
 	}
 }
 
@@ -59,7 +59,7 @@ func (l *RocketMqLogger) Warning(msg string, fields map[string]interface{}) {
 	}
 
 	if l.LevelLog == "warn" || l.LevelLog == "all" {
-		Log(ctx, fmt.Sprint(l.Flag, " [warn] ", msg))
+		g.Log().Warning(ctx, msg)
 	}
 }
 
@@ -71,7 +71,7 @@ func (l *RocketMqLogger) Error(msg string, fields map[string]interface{}) {
 		return
 	}
 	if l.LevelLog == "error" || l.LevelLog == "all" {
-		Log(ctx, fmt.Sprint(l.Flag, " [error] ", msg))
+		g.Log().Error(ctx, msg)
 	}
 }
 
@@ -84,6 +84,6 @@ func (l *RocketMqLogger) Fatal(msg string, fields map[string]interface{}) {
 	}
 
 	if l.LevelLog == "fatal" || l.LevelLog == "all" {
-		Log(ctx, fmt.Sprint(l.Flag, " [fatal] ", msg))
+		g.Log().Fatal(ctx, msg)
 	}
 }