diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go
index 4f269df2c..3c5bd6121 100644
--- a/internal/msggateway/message_handler.go
+++ b/internal/msggateway/message_handler.go
@@ -159,7 +159,7 @@ func (g GrpcHandler) SendMessage(ctx context.Context, data *Req) ([]byte, error)
 
 	c, err := proto.Marshal(resp)
 	if err != nil {
-		return nil, errs.Wrap(err, "error marshalling response")
+		return nil, errs.Wrap(err, "error marshaling response")
 	}
 
 	return c, nil
@@ -172,7 +172,7 @@ func (g GrpcHandler) SendSignalMessage(context context.Context, data *Req) ([]by
 	}
 	c, err := proto.Marshal(resp)
 	if err != nil {
-		return nil, errs.Wrap(err, "error marshalling response")
+		return nil, errs.Wrap(err, "error marshaling response")
 	}
 	return c, nil
 }
diff --git a/pkg/common/cmd/constant.go b/pkg/common/cmd/constant.go
index d444e6a8c..c332ce3a6 100644
--- a/pkg/common/cmd/constant.go
+++ b/pkg/common/cmd/constant.go
@@ -24,5 +24,3 @@ const (
 	RpcThirdServer        = "third"
 	RpcUserServer         = "user"
 )
-
-
diff --git a/pkg/common/cmd/msg_gateway.go b/pkg/common/cmd/msg_gateway.go
index e37eee9a2..317844770 100644
--- a/pkg/common/cmd/msg_gateway.go
+++ b/pkg/common/cmd/msg_gateway.go
@@ -17,11 +17,13 @@ package cmd
 import (
 	"errors"
 
-	"github.com/openimsdk/open-im-server/v3/internal/msggateway"
 	"github.com/spf13/cobra"
 
+	"github.com/openimsdk/open-im-server/v3/internal/msggateway"
+
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/tools/errs"
+
 	v3config "github.com/openimsdk/open-im-server/v3/pkg/common/config"
 )
 
diff --git a/pkg/common/cmd/root.go b/pkg/common/cmd/root.go
index ccd567461..7256bd0ed 100644
--- a/pkg/common/cmd/root.go
+++ b/pkg/common/cmd/root.go
@@ -150,7 +150,7 @@ func (r *RootCmd) getPortFlag(cmd *cobra.Command) (int, error) {
 	return port, nil
 }
 
-// // GetPortFlag returns the port flag
+// // GetPortFlag returns the port flag.
 func (r *RootCmd) GetPortFlag() (int, error) {
 	return r.port, nil
 }
diff --git a/pkg/common/convert/user.go b/pkg/common/convert/user.go
index 4b08554df..62f80e458 100644
--- a/pkg/common/convert/user.go
+++ b/pkg/common/convert/user.go
@@ -17,7 +17,7 @@ package convert
 import (
 	"time"
 
-"github.com/OpenIMSDK/protocol/sdkws"
+	"github.com/OpenIMSDK/protocol/sdkws"
 
 	relationtb "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 )
diff --git a/pkg/common/discoveryregister/discoveryregister.go b/pkg/common/discoveryregister/discoveryregister.go
index 3945f25d4..4ade0147a 100644
--- a/pkg/common/discoveryregister/discoveryregister.go
+++ b/pkg/common/discoveryregister/discoveryregister.go
@@ -15,8 +15,8 @@
 package discoveryregister
 
 import (
-	"os"
 	"errors"
+	"os"
 
 	"github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct"