Merge remote-tracking branch 'origin/3.6.1-code-conventions' into 3.6.1-code-conventions

.golangci.yml

@@ -174,20 +174,18 @@ linters-settings:
       # - ^print.*$
       - 'fmt\.Print.*'
       - fmt.Println.* # too much log noise
+      - painc
   #     - ginkgo\\.F.* # these are used just for local development
   #   # Exclude godoc examples from forbidigo checks.  Default is true.
   #   exclude_godoc_examples: false
   funlen:
-    lines: 150
+    lines: 220
     statements: 80
-  gci:
+
-    # put imports beginning with prefix after 3rd-party packages;
-    # only support one prefix
-    # if not set, use goimports.local-prefixes
-    prefix: github.com/openimsdk/open-im-server
   gocognit:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
     min-complexity: 30
+
   goconst:
     # minimal length of string constant, 3 by default
     min-len: 3
@@ -213,9 +211,6 @@ linters-settings:
     # By default list of stable checks is used.
     enabled-checks:
       #- rangeValCopy
-      - nestingreduce
-      - truncatecmp
-      - unnamedresult
       - ruleguard
 
     # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
@@ -285,9 +280,12 @@ linters-settings:
     # list of regexps for excluding particular comment lines from check
     exclude:
       # example: exclude comments which contain numbers
-      # - '[0-9]+'
+      - '[0-9]+'
+      - 'func\s+\w+'
+      - 'FIXME:'
+      - '.*func.*'
     # check that each sentence starts with a capital letter
-    capital: false
+    capital: true
   godox:
     # report any comments starting with keywords, this is useful for TODO or FIXME comments that
     # might be left in the code accidentally and should be resolved before merging
@@ -310,15 +308,15 @@ linters-settings:
     # by default
     extra-rules: false
 
-  goheader:
+  # goheader:
-    values:
+    # values:
-      const:
+      # const:
         # define here const type values in format k:v, for example:
         # COMPANY: MY COMPANY
-      regexp:
+      # regexp:
         # define here regexp type values, for example
         # AUTHOR: .*@mycompany\.com
-    template: # |-
+    # template: # |-
       # put here copyright header template for source code files, for example:
       # Note: {{ YEAR }} is a builtin value that returns the year relative to the current machine time.
       #
@@ -336,8 +334,9 @@ linters-settings:
       # 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.
-    template-path:
+    # template-path:
       # also as alternative of directive 'template' you may put the path to file with the template source
+
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
@@ -347,10 +346,11 @@ linters-settings:
     settings:
       mnd:
         # the list of enabled checks, see https://github.com/tommy-muehle/go-mnd/#checks for description.
-        checks: argument,case,condition,operation,return,assign
+        # checks: 
         # ignored-numbers: 1000
-        # ignored-files: magic_.*.go
+        ignored-files: magic_.*.go, test_.*.go, .*_test.go
-        # ignored-functions: math.*
+        ignored-functions: math.*
+
   gomoddirectives:
     # Allow local `replace` directives. Default is false.
     replace-local: true
@@ -362,6 +362,7 @@ linters-settings:
     retract-allow-no-explanation: false
     # Forbid the use of the `exclude` directives. Default is false.
     exclude-forbidden: false
+
   gomodguard:
     allowed:
       modules:    
@@ -650,7 +651,7 @@ linters-settings:
     # if it's called for subdir of a project it can't find external interfaces. All text editor integrations
     # with golangci-lint call it on a directory with the changed file.
     check-exported: false
-  unused:
+  # unused:
     # treat code as a program (not a library) and report unused exported identifiers; default is false.
     # XXX: if you enable this setting, unused will report a lot of false-positives in text editors:
     # if it's called for subdir of a project it can't find funcs usages. All text editor integrations
@@ -677,6 +678,7 @@ linters-settings:
         - encoding/*
         - github.com/pkg/*
         - github.com/openimsdk/*
+        - github.com/OpenIMSDK/*
 
   wsl:
     # If true append is only allowed to be cuddled if appending value is
@@ -737,13 +739,15 @@ linters:
     - dupword
     - errname
     - gci
-    - goheader
+    - gocritic
     - goprintffuncname
+    - gomnd
+    - goconst
     - gosec
     - misspell      # Spelling mistakes
     - staticcheck   # Static analysis
     - unused        # Checks for unused code
-    - goimports     # Checks if imports are correctly sorted and formatted
+    # - goimports     # Checks if imports are correctly sorted and formatted
     - godot         # Checks for comment punctuation
     - bodyclose     # Ensures HTTP response body is closed
     - stylecheck    # Style checker for Go code

internal/push/offlinepush/getui/push.go

@@ -45,7 +45,7 @@ const (
 	taskURL      = "/push/list/message"
 	batchPushURL = "/push/list/alias"
 
-	// codes.
+	// Codes.
 	tokenExpireCode = 10001
 	tokenExpireTime = 60 * 60 * 23
 	taskIDTTL       = 1000 * 60 * 60 * 24

internal/rpc/conversation/conversaion.go

@@ -433,7 +433,7 @@ func (c *conversationServer) conversationSort(conversations map[int64]string, re
 		keys = append(keys, key)
 	}
 
-	sort.Slice(keys[:], func(i, j int) bool {
+	sort.Slice(keys, func(i, j int) bool {
 		return keys[i] > keys[j]
 	})
 	index := 0

internal/rpc/msg/server.go

@@ -32,7 +32,7 @@ type (
 	// MessageInterceptorChain defines a chain of message interceptor functions.
 	MessageInterceptorChain []MessageInterceptorFunc
 
-	// msgServer encapsulates dependencies required for message handling.
+	// MsgServer encapsulates dependencies required for message handling.
 	msgServer struct {
 		RegisterCenter         discoveryregistry.SvcDiscoveryRegistry // Service discovery registry for service registration.
 		MsgDatabase            controller.CommonMsgDatabase           // Interface for message database operations.

internal/rpc/msg/verify.go

@@ -26,7 +26,6 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 )
 

pkg/authverify/token.go

@@ -23,7 +23,6 @@ import (
 	"github.com/OpenIMSDK/tools/tokenverify"
 	"github.com/OpenIMSDK/tools/utils"
 	"github.com/golang-jwt/jwt/v4"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 

pkg/callbackstruct/group.go

@@ -16,7 +16,6 @@ package callbackstruct
 
 import (
 	common "github.com/OpenIMSDK/protocol/sdkws"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
 )
 

pkg/common/cmd/api.go

@@ -16,9 +16,8 @@ package cmd
 
 import (
 	"github.com/OpenIMSDK/protocol/constant"
-	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
-
 	"github.com/openimsdk/open-im-server/v3/internal/api"
+	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"github.com/spf13/cobra"
 )
 

pkg/common/cmd/msg_gateway.go

@@ -17,10 +17,9 @@ package cmd
 import (
 	"log"
 
-	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
-
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/openimsdk/open-im-server/v3/internal/msggateway"
+	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 	"github.com/spf13/cobra"
 )
 

pkg/common/cmd/msg_transfer.go

@@ -17,7 +17,6 @@ package cmd
 import (
 	"fmt"
 
-
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/openimsdk/open-im-server/v3/internal/msgtransfer"
 	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"

pkg/common/config/config.go

@@ -19,9 +19,8 @@ import (
 	"time"
 
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"gopkg.in/yaml.v3"
-
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+	"gopkg.in/yaml.v3"
 )
 
 var Config GlobalConfig

pkg/common/config/parse.go

@@ -21,10 +21,9 @@ import (
 
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/errs"
-	"gopkg.in/yaml.v3"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/msgprocessor"
 	"github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+	"gopkg.in/yaml.v3"
 )
 
 //go:embed version

pkg/common/db/cache/conversation.go

@@ -30,7 +30,7 @@ import (
 )
 
 const (
-	//conversationKey                          = "CONVERSATION:"
+	// ConversationKey                          = "CONVERSATION:"
 	//conversationIDsKey                       = "CONVERSATION_IDS:"
 	//conversationIDsHashKey                   = "CONVERSATION_IDS_HASH:"
 	//conversationHasReadSeqKey                = "CONVERSATION_HAS_READ_SEQ:"

pkg/common/db/cache/friend.go

@@ -29,7 +29,7 @@ import (
 
 const (
 	friendExpireTime = time.Second * 60 * 60 * 12
-	//friendIDsKey        = "FRIEND_IDS:"
+	// FriendIDsKey        = "FRIEND_IDS:"
 	//TwoWayFriendsIDsKey = "COMMON_FRIENDS_IDS:"
 	//friendKey           = "FRIEND_INFO:".
 )

pkg/common/db/cache/group.go

@@ -32,7 +32,7 @@ import (
 
 const (
 	groupExpireTime = time.Second * 60 * 60 * 12
-	//groupInfoKey        = "GROUP_INFO:"
+	// GroupInfoKey        = "GROUP_INFO:"
 	//groupMemberIDsKey   = "GROUP_MEMBER_IDS:"
 	//groupMembersHashKey = "GROUP_MEMBERS_HASH2:"
 	//groupMemberInfoKey  = "GROUP_MEMBER_INFO:"

pkg/common/db/cache/init_redis.go

@@ -29,7 +29,7 @@ import (
 )
 
 var (
-	// singleton pattern.
+	// Singleton pattern.
 	redisClient redis.UniversalClient
 )
 

pkg/common/db/cache/msg.go

@@ -38,10 +38,10 @@ const (
 	conversationUserMinSeq = "CON_USER_MIN_SEQ:"
 	hasReadSeq             = "HAS_READ_SEQ:"
 
-	//appleDeviceToken = "DEVICE_TOKEN".
+	// AppleDeviceToken = "DEVICE_TOKEN".
 	getuiToken  = "GETUI_TOKEN"
 	getuiTaskID = "GETUI_TASK_ID"
-	//signalCache      = "SIGNAL_CACHE:"
+	// SignalCache      = "SIGNAL_CACHE:"
 	//signalListCache  = "SIGNAL_LIST_CACHE:".
 	FCM_TOKEN = "FCM_TOKEN:"
 

pkg/common/db/cache/user.go

@@ -35,7 +35,7 @@ import (
 
 const (
 	userExpireTime = time.Second * 60 * 60 * 12
-	//userInfoKey               = "USER_INFO:".
+	// UserInfoKey               = "USER_INFO:".
 	userGlobalRecvMsgOptKey   = "USER_GLOBAL_RECV_MSG_OPT_KEY:"
 	olineStatusKey            = "ONLINE_STATUS:"
 	userOlineStatusExpireTime = time.Second * 60 * 60 * 24

pkg/common/db/mgo/black.go

@@ -19,11 +19,10 @@ import (
 
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewBlackMongo(db *mongo.Database) (relation.BlackModelInterface, error) {

pkg/common/db/mgo/conversation.go

@@ -22,11 +22,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewConversationMongo(db *mongo.Database) (*ConversationMgo, error) {

pkg/common/db/mgo/friend.go

@@ -19,11 +19,10 @@ import (
 
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 // FriendMgo implements FriendModelInterface using MongoDB as the storage backend.

pkg/common/db/mgo/friend_request.go

@@ -19,11 +19,10 @@ import (
 
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewFriendRequestMongo(db *mongo.Database) (relation.FriendRequestModelInterface, error) {

pkg/common/db/mgo/group.go

@@ -22,11 +22,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewGroupMongo(db *mongo.Database) (relation.GroupModelInterface, error) {

pkg/common/db/mgo/group_member.go

@@ -21,11 +21,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewGroupMember(db *mongo.Database) (relation.GroupMemberModelInterface, error) {

pkg/common/db/mgo/group_request.go

@@ -20,11 +20,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewGroupRequestMgo(db *mongo.Database) (relation.GroupRequestModelInterface, error) {

pkg/common/db/mgo/log.go

@@ -20,11 +20,10 @@ import (
 
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewLogMongo(db *mongo.Database) (relation.LogInterface, error) {

pkg/common/db/mgo/object.go

@@ -19,11 +19,10 @@ import (
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewS3Mongo(db *mongo.Database) (relation.ObjectInfoModelInterface, error) {

pkg/common/db/mgo/user.go

@@ -22,12 +22,11 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/mgoutil"
 	"github.com/OpenIMSDK/tools/pagination"
+	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
-
-	"github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
 
 func NewUserMongo(db *mongo.Database) (relation.UserModelInterface, error) {

pkg/common/db/s3/cont/consts.go

@@ -15,10 +15,10 @@
 package cont
 
 const (
-	// hashPath defines the storage path for hash data within the 'openim' directory.
+	// HashPath defines the storage path for hash data within the 'openim' directory.
 	hashPath = "openim/data/hash/"
 
-	// tempPath specifies the directory for temporary files in the 'openim' structure.
+	// TempPath specifies the directory for temporary files in the 'openim' structure.
 	tempPath = "openim/temp/"
 
 	// DirectPath indicates the directory for direct uploads or access within the 'openim' structure.
@@ -32,7 +32,7 @@ const (
 	// facilitating secure, authorized file transfers without requiring direct access to the storage credentials.
 	UploadTypePresigned = 2
 
-	// partSeparator is used as a delimiter in multipart upload processes,
+	// PartSeparator is used as a delimiter in multipart upload processes,
 	// separating individual file parts.
 	partSeparator = ","
 )

pkg/common/db/s3/cos/cos.go

@@ -30,9 +30,8 @@ import (
 	"time"
 
 	"github.com/OpenIMSDK/tools/errs"
-	"github.com/tencentyun/cos-go-sdk-v5"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
+	"github.com/tencentyun/cos-go-sdk-v5"
 )
 
 const (

pkg/common/db/s3/oss/oss.go

@@ -32,7 +32,6 @@ import (
 
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/db/s3"
 )
 

pkg/common/discoveryregister/zookeeper/zookeeper.go

@@ -23,7 +23,6 @@ import (
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	openkeeper "github.com/OpenIMSDK/tools/discoveryregistry/zookeeper"
 	"github.com/OpenIMSDK/tools/errs"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 

pkg/common/http/http_client.go

@@ -30,7 +30,7 @@ import (
 )
 
 var (
-	// define http client.
+	// Define http client.
 	client = &http.Client{
 		Timeout: 15 * time.Second, // max timeout is 15s
 	}

pkg/common/version/base.go

@@ -39,7 +39,7 @@ var (
 	gitMajor string = "" // major version, always numeric
 	gitMinor string = "" // minor version, numeric possibly followed by "+"
 
-	// semantic version, derived by build scripts (see
+	// Semantic version, derived by build scripts (see
 	// https://github.com/kubernetes/sig-release/blob/master/release-engineering/versioning.md#kubernetes-release-versioning
 	// https://kubernetes.io/releases/version-skew-policy/
 	// for a detailed discussion of this field)

pkg/rpccache/conversation.go

@@ -21,11 +21,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/openimsdk/localcache"
-	"github.com/redis/go-redis/v9"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
+	"github.com/redis/go-redis/v9"
 )
 
 func NewConversationLocalCache(client rpcclient.ConversationRpcClient, cli redis.UniversalClient) *ConversationLocalCache {

pkg/rpccache/friend.go

@@ -19,11 +19,10 @@ import (
 
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/openimsdk/localcache"
-	"github.com/redis/go-redis/v9"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
+	"github.com/redis/go-redis/v9"
 )
 
 func NewFriendLocalCache(client rpcclient.FriendRpcClient, cli redis.UniversalClient) *FriendLocalCache {

pkg/rpccache/group.go

@@ -21,11 +21,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/openimsdk/localcache"
-	"github.com/redis/go-redis/v9"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
+	"github.com/redis/go-redis/v9"
 )
 
 func NewGroupLocalCache(client rpcclient.GroupRpcClient, cli redis.UniversalClient) *GroupLocalCache {

pkg/rpccache/user.go

@@ -21,11 +21,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/openimsdk/localcache"
-	"github.com/redis/go-redis/v9"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/common/cachekey"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"
 	"github.com/openimsdk/open-im-server/v3/pkg/rpcclient"
+	"github.com/redis/go-redis/v9"
 )
 
 func NewUserLocalCache(client rpcclient.UserRpcClient, cli redis.UniversalClient) *UserLocalCache {

pkg/rpcclient/auth.go

@@ -19,9 +19,8 @@ import (
 
 	"github.com/OpenIMSDK/protocol/auth"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"google.golang.org/grpc"
-
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+	"google.golang.org/grpc"
 )
 
 func NewAuth(discov discoveryregistry.SvcDiscoveryRegistry, rpcRegisterName string) *Auth {

pkg/rpcclient/conversation.go

@@ -21,10 +21,9 @@ import (
 	pbconversation "github.com/OpenIMSDK/protocol/conversation"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
-	"google.golang.org/grpc"
-
 	"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 Conversation struct {

pkg/rpcclient/friend.go

@@ -20,9 +20,8 @@ import (
 	"github.com/OpenIMSDK/protocol/friend"
 	sdkws "github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"google.golang.org/grpc"
-
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+	"google.golang.org/grpc"
 )
 
 type Friend struct {

pkg/rpcclient/group.go

@@ -24,7 +24,6 @@ import (
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
-
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
 )
 

pkg/rpcclient/msg.go

@@ -26,11 +26,10 @@ import (
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/log"
 	"github.com/OpenIMSDK/tools/utils"
-	"google.golang.org/grpc"
-	"google.golang.org/protobuf/proto"
-
 	"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"
+	"google.golang.org/protobuf/proto"
 )
 
 func newContentTypeConf(conf *config.Notification) map[int32]config.NotificationConf {

pkg/rpcclient/push.go

@@ -19,9 +19,8 @@ import (
 
 	"github.com/OpenIMSDK/protocol/push"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"google.golang.org/grpc"
-
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+	"google.golang.org/grpc"
 )
 
 type Push struct {

pkg/rpcclient/third.go

@@ -19,9 +19,8 @@ import (
 
 	"github.com/OpenIMSDK/protocol/third"
 	"github.com/OpenIMSDK/tools/discoveryregistry"
-	"google.golang.org/grpc"
-
 	util "github.com/openimsdk/open-im-server/v3/pkg/util/genutil"
+	"google.golang.org/grpc"
 )
 
 type Third struct {

pkg/rpcclient/user.go

@@ -23,11 +23,10 @@ import (
 	"github.com/OpenIMSDK/tools/discoveryregistry"
 	"github.com/OpenIMSDK/tools/errs"
 	"github.com/OpenIMSDK/tools/utils"
-	"google.golang.org/grpc"
-
 	"github.com/openimsdk/open-im-server/v3/pkg/authverify"
 	"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"
 )
 
 // User represents a structure holding connection details for the User RPC client.