blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-01-10 22:27:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: make build issue

Browse Source 
Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
This commit is contained in:
Xinwei Xiong(cubxxw-openim) 2023-07-14 14:10:56 +08:00
parent d014cf8ac9
commit 7906a9b168
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/msggateway/long_conn.go
View File

@ -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)

2
internal/push/offlinepush/jpush/body/platform.go
View File

@ -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)
}

3
internal/rpc/group/group.go
View File

@ -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"

2
internal/rpc/msg/lock.go
View File

@ -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)
}

5
pkg/common/db/s3/minio/minio.go
View File

@ -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 (

2
pkg/common/db/table/unrelation/msg.go
View File

@ -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"

3
pkg/common/db/unrelation/msg.go
View File

@ -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},
},
},
},