Merge remote-tracking branch 'origin/main'

internal/api/friend.go

@@ -15,10 +15,11 @@
 package api
 
 import (
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
 	"github.com/OpenIMSDK/protocol/friend"
 	"github.com/OpenIMSDK/tools/a2r"
 
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"
+
 	"github.com/gin-gonic/gin"
 )
 

internal/rpc/friend/friend.go

@@ -16,6 +16,7 @@ package friend
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/protocol/sdkws"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"

pkg/common/db/controller/black.go

@@ -16,6 +16,7 @@ package controller
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
 

pkg/common/db/relation/black_model.go

@@ -16,6 +16,7 @@ package relation
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/tools/errs"
 
 	"github.com/OpenIMSDK/tools/ormutil"