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

Merge main into sweep/real-time-status-updates

Browse Source
This commit is contained in:
sweep-ai[bot] 2023-08-18 14:16:46 +00:00 committed by GitHub
commit d6e97821d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,10 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/OpenIMSDK/tools/log"
"time" "time"
"github.com/OpenIMSDK/tools/log"
"github.com/OpenIMSDK/protocol/msg" "github.com/OpenIMSDK/protocol/msg"
"github.com/OpenIMSDK/protocol/constant" "github.com/OpenIMSDK/protocol/constant"

2
tools/component/main.go
View File

@ -29,7 +29,7 @@ import (
) )
const ( const (
cfgPath = "../../config/config.yaml" cfgPath = "../../../../../config/config.yaml"
minioHealthCheckDuration = 1 minioHealthCheckDuration = 1
maxRetry = 100 maxRetry = 100
componentStartErrCode = 6000 componentStartErrCode = 6000