chore: seed migration objects batch 5

server/internal/library/queue/queue.go

@@ -11,8 +11,6 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"hotgo/internal/library/queue/disk"
 	"hotgo/utility/charset"
-	"os"
-	"strings"
 	"sync"
 	"time"
 )
@@ -59,14 +57,11 @@ type RocketmqConf struct {
 type KafkaConf struct {
 	Address       []string `json:"address"`
 	Version       string   `json:"version"`
+	Username      string   `json:"username"`
+	Password      string   `json:"password"`
+	Mechanism     string   `json:"mechanism"`
 	RandClient    bool     `json:"randClient"`
 	MultiConsumer bool     `json:"multiConsumer"`
-	ClientId      string   `json:"clientId"`
-	UserName      string   `json:"userName"`
-	Password      string   `json:"password"`
-	SASLEnabled   bool     `json:"saslEnabled"`
-	SASLMechanism string   `json:"saslMechanism"`
-	TLSEnabled    bool     `json:"tlsEnabled"`
 }
 
 type MqMsg struct {
@@ -93,7 +88,6 @@ func init() {
 	if err := g.Cfg().MustGet(ctx, "queue").Scan(&config); err != nil {
 		Logger().Warningf(ctx, "queue init err:%+v", err)
 	}
-	normalizeKafkaConf()
 }
 
 // InstanceConsumer 实例化消费者
@@ -130,15 +124,12 @@ func NewProducer(groupName string) (mqClient MqProducer, err error) {
 			return
 		}
 		mqClient, err = RegisterKafkaProducer(KafkaConfig{
-			Brokers:       config.Kafka.Address,
-			GroupID:       groupName,
-			Version:       config.Kafka.Version,
-			ClientId:      firstKafkaClientId(config.Kafka.ClientId, "hotgo-producer"),
-			UserName:      config.Kafka.UserName,
-			Password:      config.Kafka.Password,
-			SASLEnabled:   config.Kafka.SASLEnabled,
-			SASLMechanism: config.Kafka.SASLMechanism,
-			TLSEnabled:    config.Kafka.TLSEnabled,
+			Brokers:   config.Kafka.Address,
+			GroupID:   groupName,
+			Version:   config.Kafka.Version,
+			UserName:  config.Kafka.Username,
+			Password:  config.Kafka.Password,
+			Mechanism: config.Kafka.Mechanism,
 		})
 	case "redis":
 		if _, err = g.Redis().Do(ctx, "ping"); err == nil {
@@ -200,15 +191,13 @@ func NewConsumer(groupName string) (mqClient MqConsumer, err error) {
 		}
 
 		mqClient, err = RegisterKafkaMqConsumer(KafkaConfig{
-			Brokers:       config.Kafka.Address,
-			GroupID:       groupName,
-			Version:       config.Kafka.Version,
-			ClientId:      clientId,
-			UserName:      config.Kafka.UserName,
-			Password:      config.Kafka.Password,
-			SASLEnabled:   config.Kafka.SASLEnabled,
-			SASLMechanism: config.Kafka.SASLMechanism,
-			TLSEnabled:    config.Kafka.TLSEnabled,
+			Brokers:   config.Kafka.Address,
+			GroupID:   groupName,
+			Version:   config.Kafka.Version,
+			ClientId:  clientId,
+			UserName:  config.Kafka.Username,
+			Password:  config.Kafka.Password,
+			Mechanism: config.Kafka.Mechanism,
 		})
 	case "redis":
 		if _, err = g.Redis().Do(ctx, "ping"); err == nil {
@@ -233,30 +222,6 @@ func NewConsumer(groupName string) (mqClient MqConsumer, err error) {
 	return
 }
 
-func normalizeKafkaConf() {
-	config.Kafka.UserName = resolveEnvPlaceholder(config.Kafka.UserName)
-	config.Kafka.Password = resolveEnvPlaceholder(config.Kafka.Password)
-	if config.Kafka.SASLMechanism == "" {
-		config.Kafka.SASLMechanism = "SCRAM-SHA-512"
-	}
-}
-
-func resolveEnvPlaceholder(value string) string {
-	value = strings.TrimSpace(value)
-	if strings.HasPrefix(value, "${") && strings.HasSuffix(value, "}") {
-		return os.Getenv(strings.TrimSuffix(strings.TrimPrefix(value, "${"), "}"))
-	}
-	return value
-}
-
-func firstKafkaClientId(value string, fallback string) string {
-	value = strings.TrimSpace(value)
-	if value != "" {
-		return value
-	}
-	return fallback
-}
-
 // BodyString 返回消息体
 func (m *MqMsg) BodyString() string {
 	return string(m.Body)