Commit Graph

2666 Commits

Author SHA1 Message Date
Gordon d3279694b7 add global msg recv opt 2022-06-15 13:12:16 +08:00
Gordon 8fe6231ebc add global msg recv opt 2022-06-15 13:11:08 +08:00
Gordon 6f0860d954 add global msg recv opt 2022-06-15 12:57:40 +08:00
Gordon 1e62ddce73 super update 2022-06-15 11:31:24 +08:00
wangchuxiao 956d745034 alter rtc timeout 2022-06-15 11:13:10 +08:00
Gordon ccc69ac2d0 Merge remote-tracking branch 'origin/superGroup' into superGroup
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
2022-06-15 11:08:52 +08:00
wangchuxiao 68365aa3b7 alter rtc timeout 2022-06-15 10:34:32 +08:00
wangchuxiao a0581618a4 Merge branch 'tuoyun' into superGroup
# Conflicts:
#	config/config.yaml
#	internal/msg_gateway/gate/logic.go
#	internal/msg_gateway/gate/ws_server.go
#	internal/push/logic/push_to_client.go
#	internal/rpc/group/group.go
#	internal/rpc/msg/send_msg.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
2022-06-15 10:31:58 +08:00
Gordon cfcccd0240 user add global set message recv opt 2022-06-14 18:20:08 +08:00
Gordon 926de3fa94 log 2022-06-14 17:27:04 +08:00
Gordon 38ded2c43d send message remove online status split 2022-06-14 17:24:40 +08:00
wangchuxiao f324bb603d rtc 2022-06-14 16:05:45 +08:00
wangchuxiao d190616d34 rtc 2022-06-14 16:03:20 +08:00
wangchuxiao d7884f89f5 rtc 2022-06-14 15:56:06 +08:00
Gordon d8ce122254 redis model update 2022-06-14 15:47:34 +08:00
wangchuxiao 9c1ca78fed rtc 2022-06-14 15:27:11 +08:00
wangchuxiao 31c123a09b rtc 2022-06-14 15:25:18 +08:00
wangchuxiao 0e93295cdf rtc 2022-06-14 15:24:40 +08:00
wangchuxiao 5e7eda6781 rtc 2022-06-14 15:03:05 +08:00
wangchuxiao f31179bb9a rtc 2022-06-14 13:21:30 +08:00
wangchuxiao 805b7705b2 rtc 2022-06-14 10:52:23 +08:00
wangchuxiao ae649a0e31 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-14 10:42:56 +08:00
wangchuxiao d797d7b47a rtc 2022-06-14 10:41:52 +08:00
skiffer-git 7308d0f9c6 config 2022-06-14 10:37:39 +08:00
skiffer-git 2ab1f3749c Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-13 21:08:53 +08:00
skiffer-git 52199fb5d3 config 2022-06-13 21:08:25 +08:00
wangchuxiao ad497b7386 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-13 20:11:59 +08:00
wangchuxiao 257e98edb2 group 2022-06-13 20:11:43 +08:00
skiffer-git 5be23220e4 super group 2022-06-13 18:27:52 +08:00
skiffer-git 25310d5e88 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-13 17:20:13 +08:00
skiffer-git 4bc9da3910 set groupID 2022-06-13 17:19:48 +08:00
wangchuxiao 6dfba3c7b8 group 2022-06-13 16:25:03 +08:00
Gordon 034201a45b redis model update 2022-06-13 16:09:34 +08:00
Gordon d43b9fc6c1 redis model update 2022-06-13 15:58:14 +08:00
wangchuxiao 94ec584dc3 signal 2022-06-13 15:42:48 +08:00
Gordon 043188ab5e push update 2022-06-13 15:24:13 +08:00
Gordon 2cbffb96fd push update 2022-06-13 15:20:23 +08:00
Gordon 50f7057f68 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-13 15:19:15 +08:00
Gordon f3b083cafd push update 2022-06-13 15:19:04 +08:00
wangchuxiao d881ab5fea signal 2022-06-13 15:04:36 +08:00
skiffer-git 464200e693 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-13 14:59:06 +08:00
skiffer-git 9ae84a69be SuperGroupOnlineBatchPushOneMsg 2022-06-13 14:56:24 +08:00
wangchuxiao 47184ca01e org 2022-06-13 14:27:41 +08:00
wangchuxiao 39d4d01814 org 2022-06-13 13:01:49 +08:00
wangchuxiao 5419478c48 org 2022-06-13 12:23:13 +08:00
wangchuxiao 52d8ab5389 singal 2022-06-13 11:53:12 +08:00
wangchuxiao 7d6701780c Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-13 10:38:15 +08:00
wangchuxiao dbc055efb4 org 2022-06-13 10:38:00 +08:00
skiffer-git f9c2b4c28e SuperGroupOnlineBatchPushOneMsg 2022-06-13 09:00:09 +08:00
Gordon 7c90baf7bf remove online offline split 2022-06-12 18:27:01 +08:00