Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

# Conflicts:
#	pkg/common/mw/rpc_server_interceptor.go
This commit is contained in:
wangchuxiao
2023-03-15 17:59:38 +08:00
parent cbfe679f06
commit 51d8c0ba51
3 changed files with 59 additions and 26 deletions
+2 -2
View File
@@ -28,7 +28,7 @@ func run(port int) error {
if port == 0 {
port = config.Config.Api.GinPort[0]
}
cache, err := cache.NewRedis()
rdb, err := cache.NewRedis()
if err != nil {
return err
}
@@ -37,7 +37,7 @@ func run(port int) error {
return err
}
log.NewPrivateLog(constant.LogFileName)
router := api.NewGinRouter(zk, cache)
router := api.NewGinRouter(zk, rdb)
var address string
if config.Config.Api.ListenIP != "" {
address = net.JoinHostPort(config.Config.Api.ListenIP, strconv.Itoa(port))