172 Commits

Author SHA1 Message Date
skiffer-git
5860f1fa7a add send msg timeout 2022-06-10 22:59:45 +08:00
skiffer-git
6a149c74d1 Merge remote-tracking branch 'origin/tuoyun' into tuoyun 2022-06-10 22:54:43 +08:00
skiffer-git
6ae71dba4f add send msg timeout 2022-06-10 22:54:15 +08:00
wangchuxiao
1687b70bde fix signal 2022-06-10 17:31:30 +08:00
skiffer-git
d49ceef637 log 2022-06-10 15:55:07 +08:00
skiffer-git
da573ac573 log 2022-06-10 15:37:24 +08:00
skiffer-git
202811f3c6 groupID digitization 2022-06-10 13:32:40 +08:00
skiffer-git
0e77caa329 batch push 2022-06-10 10:48:03 +08:00
Gordon
2ede9ef8ed add batch push 2022-06-09 18:24:32 +08:00
Gordon
1d4dc81e55 add batch push 2022-06-09 18:08:42 +08:00
skiffer-git
e57ce28d2b batch push 2022-06-09 17:04:16 +08:00
skiffer-git
60f8f93a02 batch push 2022-06-09 15:20:40 +08:00
skiffer-git
4f184a6723 batch push 2022-06-09 14:24:24 +08:00
skiffer-git
5fd91e808a batch push 2022-06-09 14:07:09 +08:00
skiffer-git
d2474c8a72 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-09 12:49:54 +08:00
skiffer-git
9eb0dd5e70 batch push 2022-06-09 12:49:16 +08:00
wangchuxiao
bbdcb34ab6 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-09 12:39:42 +08:00
wangchuxiao
6525d63459 fix bug 2022-06-09 12:39:28 +08:00
skiffer-git
317e6f81bb batch push 2022-06-08 20:26:08 +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
skiffer-git
3f2638efaf KickUserOffline 2022-06-07 16:28:51 +08:00
Gordon
89f40fe3de kick 2022-06-07 16:17:08 +08:00
Gordon
f8962beca6 kick 2022-06-07 16:05:59 +08:00
Gordon
34e8b79e7e pb file 2022-06-07 10:38:01 +08:00
Gordon
8bd5db431b add function 2022-06-06 20:54:53 +08:00
wangchuxiao
d3abc44976 singal offline push 2022-06-06 18:15:32 +08:00
wangchuxiao
16d33b1c1f singal offline push 2022-06-02 18:17:11 +08:00
Gordon
0a260a67d5 ws and push update 2022-06-02 17:37:00 +08:00
Gordon
a18dcfce9e ws and push update 2022-06-02 16:44:55 +08:00
Gordon
0aefab34f1 log 2022-05-30 19:37:54 +08:00
Gordon
5392c9fd38 log 2022-05-30 19:31:09 +08:00
Gordon
7285e2b2c9 add super group 2022-05-28 18:10:08 +08:00
wangchuxiao
8967343079 superGroup 2022-05-27 19:33:47 +08:00
wangchuxiao
098f8a52f7 callback 2022-05-26 19:59:40 +08:00
wangchuxiao
b4da35a0ab ingress 2022-05-26 18:02:00 +08:00
skiffer-git
17b4a0525d log 2022-05-21 10:59:44 +08:00
skiffer-git
313cf858f0 Statistics 2022-05-18 11:52:15 +08:00
wenxu12345
a4f5dd9d89 add log 2022-05-11 12:13:17 +08:00
Gordon
2b479319c1 log change 2022-05-10 10:52:32 +08:00
Gordon
9303096430 log change 2022-05-10 09:09:37 +08:00
Gordon
446688d5b2 test 2022-05-09 18:34:14 +08:00
Gordon
e2cacd9c4b test 2022-05-09 18:23:06 +08:00
skiffer-git
dca16e83d3 rpc register ip 2022-05-07 17:05:05 +08:00
wangchuxiao
0b4ba548a5 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-05-07 11:14:56 +08:00
wangchuxiao
747b963bd4 cache 2022-05-07 11:14:29 +08:00
skiffer-git
a9ce8a3b2e upgrade etcd & grpc 2022-05-07 09:34:49 +08:00
Gordon
bf8e35e168 log change 2022-05-05 16:13:45 +08:00
skiffer-git
2bdaaa5a33 log 2022-04-20 20:58:51 +08:00
skiffer-git
bd6e8d093a add operationID when ws connecting 2022-04-18 21:39:46 +08:00
skiffer-git
f7b5a86a09 add operationID when ws connecting 2022-04-18 21:34:58 +08:00