Merge remote-tracking branch 'origin/errcode' into errcode

internal/msggateway/batch_push.go

@@ -2,7 +2,6 @@ package msggateway
 
 import (
 	"Open_IM/pkg/common/config"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	pbChat "Open_IM/pkg/proto/msg"
 	sdkws "Open_IM/pkg/proto/sdkws"

internal/msggateway/init.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"sync"
 
-	prome "Open_IM/pkg/common/prometheus"
+	prome "Open_IM/pkg/common/prome"
 
 	"github.com/go-playground/validator/v10"
 )

internal/msggateway/logic.go

@@ -3,7 +3,6 @@ package msggateway
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/common/prome"
 	pbChat "Open_IM/pkg/proto/msg"

internal/msggateway/new/compressor.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"compress/gzip"
 	"io/ioutil"
-	"open_im_sdk/pkg/utils"
 )
 
 type Compressor interface {

internal/msggateway/new/encoder.go

@@ -3,7 +3,6 @@ package new
 import (
 	"bytes"
 	"encoding/gob"
-	"open_im_sdk/pkg/utils"
 )
 
 type Encoder interface {

internal/msggateway/relay_rpc_server.go

@@ -12,15 +12,13 @@ import (
 	"bytes"
 	"context"
 	"encoding/gob"
+	"github.com/golang/protobuf/proto"
+	"github.com/gorilla/websocket"
+	grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
+	"google.golang.org/grpc"
 	"net"
 	"strconv"
 	"strings"
-
-	"github.com/golang/protobuf/proto"
-	grpcPrometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
-
-	"github.com/gorilla/websocket"
-	"google.golang.org/grpc"
 )
 
 type RPCServer struct {

internal/msggateway/ws_server.go

@@ -3,9 +3,8 @@ package msggateway
 import (
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
-	prome "Open_IM/pkg/common/prometheus"
+	prome "Open_IM/pkg/common/prome"
 	"Open_IM/pkg/common/tokenverify"
 	pbRelay "Open_IM/pkg/proto/relay"
 	"Open_IM/pkg/utils"