Merge branch 'main' of github.com:wangchuxiao-dev/Open-IM-Server

pkg/common/db/cache/group.go

@@ -16,9 +16,10 @@ package cache
 
 import (
 	"context"
-	"github.com/OpenIMSDK/tools/log"
 	"time"
 
+	"github.com/OpenIMSDK/tools/log"
+
 	"github.com/dtm-labs/rockscache"
 	"github.com/redis/go-redis/v9"
 

tools/component/main.go

@@ -4,7 +4,12 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
+	"net"
+	"net/url"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
 	"github.com/Shopify/sarama"
@@ -17,11 +22,8 @@ import (
 	"gopkg.in/yaml.v3"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
-	"net"
+
-	"net/url"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
-	"os"
-	"strings"
-	"time"
 
 	"github.com/minio/minio-go/v7/pkg/credentials"
 )