Merge remote-tracking branch 'origin/main'

pkg/common/kafka/consumer_group.go

@@ -17,9 +17,10 @@ package kafka
 import (
 	"context"
 
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/tools/log"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+
 	"github.com/Shopify/sarama"
 )
 

pkg/common/kafka/util.go

@@ -1,9 +1,10 @@
 package kafka
 
 import (
+	"github.com/Shopify/sarama"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/tls"
-	"github.com/Shopify/sarama"
 )
 
 // SetupTLSConfig set up the TLS config from config file.

pkg/common/tls/tls.go

@@ -10,7 +10,6 @@ import (
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
 )
 
-
 func decryptPEM(data []byte, passphrase []byte) ([]byte, error) {
 	if len(passphrase) == 0 {
 		return data, nil