Merge remote-tracking branch 'origin/main'

internal/msggateway/hub_server.go

@@ -16,6 +16,7 @@ package msggateway
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/tools/mcontext"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"

internal/msggateway/n_ws_server.go

@@ -17,13 +17,14 @@ package msggateway
 import (
 	"context"
 	"errors"
-	"github.com/OpenIMSDK/protocol/msggateway"
 	"net/http"
 	"strconv"
 	"sync"
 	"sync/atomic"
 	"time"
 
+	"github.com/OpenIMSDK/protocol/msggateway"
+
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 

test/data-conversion/kafka-conversation.go

@@ -16,6 +16,7 @@ package data_conversion
 
 import (
 	"fmt"
+
 	"github.com/Shopify/sarama"
 )
 

test/data-conversion/mysql-conversion.go

@@ -17,11 +17,13 @@ package data_conversion
 import (
 	"context"
 	"fmt"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
+	"time"
+
 	"github.com/OpenIMSDK/tools/log"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
-	"time"
+
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
 )
 
 var (