Merge branch 'main' into localcache

# Conflicts:
#	go.mod
#	go.sum
#	internal/push/push_to_client.go

pkg/common/config/version

@@ -1 +1 @@
-v3.5.0
+3.5.1

pkg/common/db/mgo/conversation.go

@@ -114,7 +114,8 @@ func (c *ConversationMgo) GetAllConversationIDs(ctx context.Context) ([]string,
 func (c *ConversationMgo) GetAllConversationIDsNumber(ctx context.Context) (int64, error) {
 	counts, err := mgoutil.Aggregate[int64](ctx, c.coll, []bson.M{
 		{"$group": bson.M{"_id": "$conversation_id"}},
-		{"$project": bson.M{"_id": 0, "conversation_id": "$_id"}},
+		{"$group": bson.M{"_id": nil, "count": bson.M{"$sum": 1}}},
+		{"$project": bson.M{"_id": 0}},
 	})
 	if err != nil {
 		return 0, err

pkg/common/discoveryregister/direct/directResolver.go

@@ -1,11 +1,26 @@
+// Copyright © 2024 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package direct
 
 import (
 	"context"
-	"github.com/OpenIMSDK/tools/log"
-	"google.golang.org/grpc/resolver"
 	"math/rand"
 	"strings"
+
+	"github.com/OpenIMSDK/tools/log"
+	"google.golang.org/grpc/resolver"
 )
 
 const (

pkg/common/discoveryregister/direct/directconn.go

@@ -1,13 +1,29 @@
+// Copyright © 2024 OpenIM. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package direct
 
 import (
 	"context"
 	"errors"
 	"fmt"
+
 	"github.com/OpenIMSDK/tools/errs"
-	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
+
+	config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
 type ServiceAddresses map[string][]int

pkg/common/discoveryregister/discoveryregister.go

@@ -16,9 +16,10 @@ package discoveryregister
 
 import (
 	"errors"
-	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct"
 	"os"
 
+	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/kubernetes"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/zookeeper"