diff --git a/open_im_sdk/constant.go b/open_im_sdk/constant.go index 1af7573b5..57376b943 100644 --- a/open_im_sdk/constant.go +++ b/open_im_sdk/constant.go @@ -137,7 +137,7 @@ var UserSDKRwLock sync.RWMutex var UserRouterMap map[string]*UserRelated var SvrConf IMConfig var SdkLogFlag int32 - +var HearbeatInterval int32 = 5 var userForSDK *UserRelated const ( diff --git a/open_im_sdk/init_login.go b/open_im_sdk/init_login.go index 75a187486..9a76d1462 100644 --- a/open_im_sdk/init_login.go +++ b/open_im_sdk/init_login.go @@ -627,7 +627,7 @@ func (u *UserRelated) heartbeat() { u.DelCh(msgIncr) LogEnd("DelCh", wsReq.OperationID) - time.Sleep(time.Duration(5) * time.Second) + time.Sleep(time.Duration(HearbeatInterval) * time.Second) } } diff --git a/open_im_sdk/open_im_sdk_interface.go b/open_im_sdk/open_im_sdk_interface.go index 879dccfd6..ae2b4e4a0 100644 --- a/open_im_sdk/open_im_sdk_interface.go +++ b/open_im_sdk/open_im_sdk_interface.go @@ -51,6 +51,10 @@ func SetSdkLog(flag int32) { SdkLogFlag = flag } +func SetHearbeatInterval(interval int32) { + HearbeatInterval = interval +} + func UnInitSDK() { if userForSDK == nil { sdkLog("userForSDK nil") diff --git a/open_im_sdk/ws_wrapper/open_im_sdk_my.go b/open_im_sdk/ws_wrapper/open_im_sdk_my.go index 7a3aba0c0..46f0a30c4 100644 --- a/open_im_sdk/ws_wrapper/open_im_sdk_my.go +++ b/open_im_sdk/ws_wrapper/open_im_sdk_my.go @@ -21,7 +21,7 @@ func main() { var openIMWsAddress, openIMApiAddress *string APIADDR := "http://121.37.25.71:10000" WSADDR := "ws://121.37.25.71:17778" - + open_im_sdk.SetHearbeatInterval(300) sysType := runtime.GOOS switch sysType { case "darwin": diff --git a/open_im_sdk/ws_wrapper/open_im_sdk_server.go b/open_im_sdk/ws_wrapper/open_im_sdk_server.go index 07c3fd74e..51d931eed 100644 --- a/open_im_sdk/ws_wrapper/open_im_sdk_server.go +++ b/open_im_sdk/ws_wrapper/open_im_sdk_server.go @@ -26,7 +26,7 @@ func main() { openIMApiPort = flag.Int("openIM_api_port", 10000, "openIM api listening port") openIMWsPort = flag.Int("openIM_ws_port", 17778, "openIM ws listening port") flag.Parse() - + open_im_sdk.SetHearbeatInterval(300) //switch *openIMTerminalType { //case "pc": // openIMWsAddress = flag.String("openIM_ws_address", "web", "different terminal types") @@ -42,6 +42,7 @@ func main() { sysType := runtime.GOOS switch sysType { + case "darwin": ws_local_server.InitServer(&open_im_sdk.IMConfig{IpApiAddr: *openIMApiAddress, IpWsAddr: *openIMWsAddress, Platform: utils.OSXPlatformID, DbDir: "./"}) diff --git a/test/main.go b/test/main.go index ed7bbcf6c..6bbd53a4b 100644 --- a/test/main.go +++ b/test/main.go @@ -317,19 +317,20 @@ func getMyIP() string { } var ( - APIADDR = "http://43.128.5.63:10000" - WSADDR = "ws://43.128.5.63:17778" - REGISTERADDR = "http://43.128.5.63:10000/auth/user_register" - TOKENADDR = "http://43.128.5.63:10000/auth/user_token" + TESTIP = "43.128.5.63" + APIADDR = "http://" + TESTIP + ":10000" + WSADDR = "ws://" + TESTIP + ":17778" + REGISTERADDR = APIADDR + "/user_register" + TOKENADDR = APIADDR + "/auth/user_token" SECRET = "tuoyun" SENDINTERVAL = 20 ) // myuid, maxuid, msgnum func main() { - + open_im_sdk.SetHearbeatInterval(300) for i := 0; i < 1; i++ { - myUid1 := 18666662412 + myUid1 := 17712341234 strMyUid1 := GenUid(myUid1) runRigister(strMyUid1)