1019 Commits

Author SHA1 Message Date
Gordon
d7961bf226 redis replace to go_redis 2022-06-15 16:33:30 +08:00
wangchuxiao
1aee41e7e7 go-redis 2022-06-15 16:16:35 +08:00
wangchuxiao
f4cdbe985e alter rtc timeout 2022-06-15 14:57:21 +08:00
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
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
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
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
0e93295cdf rtc 2022-06-14 15:24:40 +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
d797d7b47a rtc 2022-06-14 10:41:52 +08:00
wangchuxiao
257e98edb2 group 2022-06-13 20:11:43 +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
Gordon
2cbffb96fd push update 2022-06-13 15:20:23 +08:00
Gordon
f3b083cafd push update 2022-06-13 15:19:04 +08:00
wangchuxiao
52d8ab5389 singal 2022-06-13 11:53:12 +08:00
wangchuxiao
dbc055efb4 org 2022-06-13 10:38:00 +08:00
wangchuxiao
fdaf4380fa base64 userID 2022-06-10 18:23:31 +08:00
wangchuxiao
1687b70bde fix signal 2022-06-10 17:31:30 +08:00
Gordon
2ede9ef8ed add batch push 2022-06-09 18:24:32 +08:00
wangchuxiao
dbcfcafdfc fix word 2022-06-09 18:16:23 +08:00
wangchuxiao
ceca0f095b demo 2022-06-09 17:24:30 +08:00
wangchuxiao
ab76d46007 demo 2022-06-09 17:19:39 +08:00
wangchuxiao
9b4890a99f fix bug 2022-06-09 15:33:37 +08:00
wangchuxiao
c8bf95578c fix bug 2022-06-09 15:25:02 +08:00
wangchuxiao
7b08d98647 fix bug 2022-06-09 14:58:43 +08:00
skiffer-git
32565dd188 config for msg read receipt 2022-06-09 13:57:10 +08:00
skiffer-git
96f09c45f5 batch push 2022-06-09 13:12:46 +08:00
wangchuxiao
6525d63459 fix bug 2022-06-09 12:39:28 +08:00
wangchuxiao
ae684d6d39 fix bug 2022-06-08 19:39:36 +08:00
wangchuxiao
d9710ac244 fix bug 2022-06-08 19:27:04 +08:00
wangchuxiao
dff7a28094 fix bug 2022-06-08 19:14:25 +08:00
wangchuxiao
da18950b3d fix bug 2022-06-08 19:06:22 +08:00
wangchuxiao
f650e73d5c fix bug 2022-06-08 17:36:24 +08:00
Gordon
a7a69008d8 log 2022-06-08 17:24:22 +08:00
Gordon
0214419446 log 2022-06-08 17:17:55 +08:00
wangchuxiao
26771ee7d0 organization 2022-06-08 17:07:16 +08:00
wangchuxiao
a4f69351ce fix bug 2022-06-08 16:46:21 +08:00
wangchuxiao
ed7d2bbdd7 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-08 15:07:19 +08:00
wangchuxiao
276328e0fd fix bug 2022-06-08 15:05:57 +08:00
Gordon
536d7e2957 ws pb 2022-06-08 11:42:39 +08:00
wangchuxiao
5f42748e1b Merge branch 'tuoyun' into superGroup
# Conflicts:
#	internal/msg_gateway/gate/callback.go
#	internal/msg_transfer/logic/online_history_msg_handler.go
#	internal/push/logic/callback.go
#	internal/push/logic/push_to_client.go
#	pkg/common/db/model.go
#	pkg/common/db/newRedisModel.go
#	pkg/proto/group/group.pb.go
#	pkg/proto/group/group.proto
2022-06-07 17:42:24 +08:00