blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-12-08 21:47:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Gordon 2023-08-25 10:05:22 +08:00
commit ceb0c6cb85
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/msggateway/hub_server.go
View File

@ -16,6 +16,7 @@ package msggateway
import ( import (
"context" "context"
"github.com/OpenIMSDK/tools/mcontext" "github.com/OpenIMSDK/tools/mcontext"
"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"

3
internal/msggateway/n_ws_server.go
View File

@ -17,13 +17,14 @@ package msggateway
import ( import (
"context" "context"
"errors" "errors"
"github.com/OpenIMSDK/protocol/msggateway"
"net/http" "net/http"
"strconv" "strconv"
"sync" "sync"
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/OpenIMSDK/protocol/msggateway"
"github.com/OpenIMSDK/Open-IM-Server/pkg/authverify" "github.com/OpenIMSDK/Open-IM-Server/pkg/authverify"
"github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient" "github.com/OpenIMSDK/Open-IM-Server/pkg/rpcclient"

1
test/data-conversion/kafka-conversation.go
View File

@ -16,6 +16,7 @@ package data_conversion
import ( import (
"fmt" "fmt"
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
) )

6
test/data-conversion/mysql-conversion.go
View File

@ -17,11 +17,13 @@ package data_conversion
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation" "time"
"github.com/OpenIMSDK/tools/log" "github.com/OpenIMSDK/tools/log"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
"gorm.io/gorm" "gorm.io/gorm"
"time"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/relation"
) )
var ( var (