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

internal/rpc/msg/callback.go

@@ -32,7 +32,7 @@ func toCommonCallback(ctx context.Context, msg *pbChat.SendMsgReq, command strin
 		AtUserIDList:     msg.MsgData.AtUserIDList,
 		SenderFaceURL:    msg.MsgData.SenderFaceURL,
 		Content:          utils.GetContent(msg.MsgData),
-		Seq:              msg.MsgData.Seq,
+		Seq:              uint32(msg.MsgData.Seq),
 		Ex:               msg.MsgData.Ex,
 	}
 }

internal/rpc/msg/extend_msg.go

@@ -3,7 +3,6 @@ package msg
 import (
 	"Open_IM/internal/common/notification"
 	"Open_IM/pkg/common/constant"
-	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/proto/sdkws"

internal/rpc/msg/lock.go

@@ -1,7 +1,6 @@
 package msg
 
 import (
-	"Open_IM/pkg/common/db"
 	"time"
 )
 

internal/rpc/msg/send_pull.go

@@ -2,7 +2,7 @@ package msg
 
 import (
 	"Open_IM/pkg/common/constant"
-	promePkg "Open_IM/pkg/common/prometheus"
+	promePkg "Open_IM/pkg/common/prome"
 	pbConversation "Open_IM/pkg/proto/conversation"
 	"Open_IM/pkg/proto/msg"
 	"Open_IM/pkg/proto/sdkws"

internal/rpc/msg/server.go

@@ -9,7 +9,7 @@ import (
 	discoveryRegistry "Open_IM/pkg/discoveryregistry"
 	"github.com/OpenIMSDK/openKeeper"
 
-	promePkg "Open_IM/pkg/common/prometheus"
+	promePkg "Open_IM/pkg/common/prome"
 	"Open_IM/pkg/proto/msg"
 	"google.golang.org/grpc"
 )