diff --git a/internal/msggateway/long_conn.go b/internal/msggateway/long_conn.go index c2fa324a9..59e4d5b45 100644 --- a/internal/msggateway/long_conn.go +++ b/internal/msggateway/long_conn.go @@ -71,7 +71,7 @@ func (d *GWebSocket) GenerateLongConn(w http.ResponseWriter, r *http.Request) er d.conn = conn return nil } -} + func (d *GWebSocket) WriteMessage(messageType int, message []byte) error { // d.setSendConn(d.conn) return d.conn.WriteMessage(messageType, message) diff --git a/internal/push/offlinepush/jpush/body/platform.go b/internal/push/offlinepush/jpush/body/platform.go index d15609b53..a4bc1526c 100644 --- a/internal/push/offlinepush/jpush/body/platform.go +++ b/internal/push/offlinepush/jpush/body/platform.go @@ -77,7 +77,7 @@ func (p *Platform) SetPlatform(platform string) error { return errors.New("platform err") } } -} + func (p *Platform) SetIOS() error { return p.Set(IOS) } diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 56c0284a6..22c39c499 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -26,9 +26,6 @@ import ( pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb" - pbConversation "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation" - "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/wrapperspb" - "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient/notification" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/convert" diff --git a/internal/rpc/msg/lock.go b/internal/rpc/msg/lock.go index dd99ab822..2cac4570a 100644 --- a/internal/rpc/msg/lock.go +++ b/internal/rpc/msg/lock.go @@ -49,7 +49,6 @@ func (l *LockerMessage) LockMessageTypeKey(ctx context.Context, clientMsgID, typ } return err } -} func (l *LockerMessage) LockGlobalMessage(ctx context.Context, clientMsgID string) (err error) { for i := 0; i < 3; i++ { err = l.cache.LockMessageTypeKey(ctx, clientMsgID, GlOBALLOCK) @@ -62,7 +61,6 @@ func (l *LockerMessage) LockGlobalMessage(ctx context.Context, clientMsgID strin } return err } -} func (l *LockerMessage) UnLockMessageTypeKey(ctx context.Context, clientMsgID string, typeKey string) error { return l.cache.UnLockMessageTypeKey(ctx, clientMsgID, typeKey) } diff --git a/pkg/common/db/s3/minio/minio.go b/pkg/common/db/s3/minio/minio.go index 2f80c67bb..ea8af5bca 100644 --- a/pkg/common/db/s3/minio/minio.go +++ b/pkg/common/db/s3/minio/minio.go @@ -24,6 +24,11 @@ import ( "strings" "time" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/s3" + "github.com/minio/minio-go/v7" + "github.com/minio/minio-go/v7/pkg/credentials" + "github.com/minio/minio-go/v7/pkg/signer" ) const ( diff --git a/pkg/common/db/table/unrelation/msg.go b/pkg/common/db/table/unrelation/msg.go index a4eab0142..ac4602d35 100644 --- a/pkg/common/db/table/unrelation/msg.go +++ b/pkg/common/db/table/unrelation/msg.go @@ -21,8 +21,6 @@ import ( "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" - "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" - "go.mongodb.org/mongo-driver/mongo" "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws" diff --git a/pkg/common/db/unrelation/msg.go b/pkg/common/db/unrelation/msg.go index fb889aae4..f9e9a7132 100644 --- a/pkg/common/db/unrelation/msg.go +++ b/pkg/common/db/unrelation/msg.go @@ -21,7 +21,6 @@ import ( "fmt" "time" - "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" @@ -1141,7 +1140,7 @@ func (m *MsgMongoDriver) searchMessage(ctx context.Context, req *msg.SearchMessa {"as", "item"}, { "cond", bson.D{ - {"$and", conditon}, + {"$and", condition}, }, }, },