merge the latest main

pkg/common/db/cache/conversation.go

@@ -16,7 +16,6 @@ package cache
 
 import (
 	"context"
-	"errors"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"

pkg/common/db/cache/msg.go

@@ -17,7 +17,6 @@ package cache
 import (
 	"context"
 	"errors"
-	"github.com/dtm-labs/rockscache"
 	"strconv"
 	"time"
 

pkg/rpcclient/group.go

@@ -26,7 +26,6 @@ import (
 	"github.com/OpenIMSDK/tools/utils"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
-	"google.golang.org/grpc"
 )
 
 type Group struct {
@@ -41,7 +40,7 @@ func NewGroup(discov discoveryregistry.SvcDiscoveryRegistry, config *config.Glob
 		util.ExitWithError(err)
 	}
 	client := group.NewGroupClient(conn)
-	return &Group{discov: discov, conn: conn, Client: client, Config: config}
+	return &Group{discov: discov, Client: client, Config: config}
 }
 
 type GroupRpcClient Group