pro/im_manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: normalize kafka version config

Browse Source
This commit is contained in:
richjohnrambo
2026-08-28 15:36:56 +08:00
parent a938c6cb23
commit ed4f186d8e
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -38,7 +38,7 @@ WORKDIR /app
ENV QUEUE_DRIVER=kafka ENV QUEUE_DRIVER=kafka
ENV KAFKA_ADDRESS=64.118.137.182:9094 ENV KAFKA_ADDRESS=64.118.137.182:9094
ENV KAFKA_VERSION=2.4.0.0 ENV KAFKA_VERSION=2.4.0
ENV KAFKA_USERNAME=kafka-external ENV KAFKA_USERNAME=kafka-external
ENV KAFKA_PASSWORD=gr58tNnlZOVGW3AmMbL2 ENV KAFKA_PASSWORD=gr58tNnlZOVGW3AmMbL2
ENV KAFKA_SASL_MECHANISM=SCRAM-SHA-512 ENV KAFKA_SASL_MECHANISM=SCRAM-SHA-512
server/internal/library/queue/kafkamq.go
+10 -2
View File
@@ -160,7 +160,7 @@ func (r *KafkaMq) ListenReceiveMsgDo(topic string, receiveDo func(mqMsg MqMsg))
// RegisterKafkaMqConsumer 注册消费者 // RegisterKafkaMqConsumer 注册消费者
func RegisterKafkaMqConsumer(connOpt KafkaConfig) (client MqConsumer, err error) { func RegisterKafkaMqConsumer(connOpt KafkaConfig) (client MqConsumer, err error) {
mqIns := &KafkaMq{} mqIns := &KafkaMq{}
kfkVersion, err := sarama.ParseKafkaVersion(connOpt.Version) kfkVersion, err := parseKafkaVersion(connOpt.Version)
if err != nil { if err != nil {
return return
} }
@@ -203,7 +203,7 @@ func RegisterKafkaProducer(connOpt KafkaConfig) (client MqProducer, err error) {
// doRegisterKafkaProducer 注册同步类型实例 // doRegisterKafkaProducer 注册同步类型实例
func doRegisterKafkaProducer(connOpt KafkaConfig, mqIns *KafkaMq) (err error) { func doRegisterKafkaProducer(connOpt KafkaConfig, mqIns *KafkaMq) (err error) {
kfkVersion, err := sarama.ParseKafkaVersion(connOpt.Version) kfkVersion, err := parseKafkaVersion(connOpt.Version)
if err != nil { if err != nil {
return return
} }
@@ -239,6 +239,14 @@ func doRegisterKafkaProducer(connOpt KafkaConfig, mqIns *KafkaMq) (err error) {
return return
} }
func parseKafkaVersion(version string) (sarama.KafkaVersion, error) {
parts := strings.Split(version, ".")
if len(parts) == 4 && parts[0] != "0" && parts[3] == "0" {
version = strings.Join(parts[:3], ".")
}
return sarama.ParseKafkaVersion(version)
}
func configureKafkaSASL(conf *sarama.Config, connOpt KafkaConfig) { func configureKafkaSASL(conf *sarama.Config, connOpt KafkaConfig) {
if connOpt.UserName == "" { if connOpt.UserName == "" {
return return
server/manifest/config/config.example.yaml
+1 -1
View File
@@ -213,7 +213,7 @@ queue:
logLevel: "info" # rocketmq日志输出级别，可选：all|close|debug|info|warn|error|fatal logLevel: "info" # rocketmq日志输出级别，可选：all|close|debug|info|warn|error|fatal
kafka: kafka:
address: ["127.0.0.1:9092"] # kafka地址+端口 address: ["127.0.0.1:9092"] # kafka地址+端口
version: "2.4.0.0" # kafka专属配置，默认2.4.0.0 version: "2.4.0" # kafka专属配置，默认2.4.0
username: "" # SASL用户名，未开启认证时留空 username: "" # SASL用户名，未开启认证时留空
password: "" # SASL密码，未开启认证时留空 password: "" # SASL密码，未开启认证时留空
mechanism: "SCRAM-SHA-512" # SASL机制，可选：SCRAM-SHA-512|SCRAM-SHA-256 mechanism: "SCRAM-SHA-512" # SASL机制，可选：SCRAM-SHA-512|SCRAM-SHA-256
server/manifest/docker/Dockerfile
+1 -1
View File
@@ -7,7 +7,7 @@ FROM loads/alpine:3.8
ENV WORKDIR /app ENV WORKDIR /app
ENV QUEUE_DRIVER kafka ENV QUEUE_DRIVER kafka
ENV KAFKA_ADDRESS 64.118.137.182:9094 ENV KAFKA_ADDRESS 64.118.137.182:9094
ENV KAFKA_VERSION 2.4.0.0 ENV KAFKA_VERSION 2.4.0
ENV KAFKA_USERNAME kafka-external ENV KAFKA_USERNAME kafka-external
ENV KAFKA_PASSWORD gr58tNnlZOVGW3AmMbL2 ENV KAFKA_PASSWORD gr58tNnlZOVGW3AmMbL2
ENV KAFKA_SASL_MECHANISM SCRAM-SHA-512 ENV KAFKA_SASL_MECHANISM SCRAM-SHA-512