Merge branch 'openimsdk:main' into fix/make_stop

README.md

@@ -58,7 +58,7 @@
 + 🚀 [Join our Slack community](https://join.slack.com/t/openimsdk/shared_invite/zt-22720d66b-o_FvKxMTGXtcnnnHiMqe9Q)
 + :eyes: [Join our wechat (微信群)](https://openim-1253691595.cos.ap-nanjing.myqcloud.com/WechatIMG20.jpeg)
 + 👫 [Join our Reddit](https://www.reddit.com/r/OpenIMessaging)
-+ 💬 [Follow our Twitter account](https://twitter.com/openimsdk)
++ 💬 [Follow our Twitter account](https://twitter.com/founder_im63606)
 
 ## Ⓜ️ About OpenIM
 

internal/msggateway/client.go

@@ -18,11 +18,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/OpenIMSDK/tools/errs"
 	"runtime/debug"
 	"sync"
 	"sync/atomic"
 
+	"github.com/OpenIMSDK/tools/errs"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 
 	"google.golang.org/protobuf/proto"

internal/msggateway/compressor.go

@@ -18,9 +18,10 @@ import (
 	"bytes"
 	"compress/gzip"
 	"errors"
-	"github.com/OpenIMSDK/tools/errs"
 	"io"
 	"sync"
+
+	"github.com/OpenIMSDK/tools/errs"
 )
 
 var (

internal/msggateway/encoder.go

@@ -17,6 +17,7 @@ package msggateway
 import (
 	"bytes"
 	"encoding/gob"
+
 	"github.com/OpenIMSDK/tools/errs"
 )
 

internal/rpc/auth/auth.go

@@ -29,6 +29,7 @@ import (
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/mcontext"
 	"github.com/OpenIMSDK/tools/tokenverify"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/controller"

pkg/common/db/controller/auth.go

@@ -16,6 +16,7 @@ package controller
 
 import (
 	"context"
+
 	"github.com/OpenIMSDK/tools/errs"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
@@ -24,6 +25,7 @@ import (
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/tokenverify"
+
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/cache"
 )
 

pkg/common/db/unrelation/msg.go

@@ -35,6 +35,7 @@ import (
 
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/errs"
+
 	table "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/unrelation"
 )
 

tools/formitychecker/checker/checker.go

@@ -29,7 +29,7 @@ var (
 	hyphenRegex     = regexp.MustCompile(`^[a-zA-Z0-9\-]+\.[a-zA-Z0-9]+$`)
 )
 
-// CheckDirectoCheckDirectoryries initiates the checking process for the specified directories using configuration from config.Config.
+// CheckDirectory initiates the checking process for the specified directories using configuration from config.Config.
 func CheckDirectory(cfg *config.Config) error {
 	ignoreMap := make(map[string]struct{})
 	for _, dir := range cfg.IgnoreDirs {