blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,227 Commits 40 Branches 130 Tags
Commit Graph

698 Commits

Author SHA1 Message Date
skiffer-git
8c82f811cb Merge remote-tracking branch 'origin/superGroup' into superGroup 
# Conflicts:
#	internal/rpc/user/user.go
 2022-06-16 14:10:56 +08:00
skiffer-git
dbc2713495 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:09:28 +08:00
Gordon
0a44a8e78a add global recv opt 2022-06-16 12:53:39 +08:00
Gordon
7e6e214f08 add global recv opt 2022-06-16 12:41:31 +08:00
wangchuxiao
f9a26e9195 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 11:35:22 +08:00
wangchuxiao
ea76f20825 GlobalRecvMsgOpt 2022-06-16 11:27:55 +08:00
skiffer-git
0d2c0e91c8 use sarama v1.29.0 2022-06-16 10:26:37 +08:00
skiffer-git
f4f6ea681e Optimization for log 2022-06-15 18:02:48 +08:00
Gordon
f96e12a8b3 redis replace to go_redis 2022-06-15 16:50:45 +08:00
wangchuxiao
7dbc8a4253 go-redis 2022-06-15 16:18:41 +08:00
wangchuxiao
16641f0494 alter rtc timeout 2022-06-15 13:44:45 +08:00
wangchuxiao
5965dcd029 alter rtc timeout 2022-06-15 13:39:49 +08:00
wangchuxiao
e45ef5c49a alter rtc timeout 2022-06-15 13:30:58 +08:00
wangchuxiao
9eed6ce197 alter rtc timeout 2022-06-15 13:24:21 +08:00
Gordon
1e62ddce73 super update 2022-06-15 11:31:24 +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
38ded2c43d send message remove online status split 2022-06-14 17:24:40 +08:00
skiffer-git
4bc9da3910 set groupID 2022-06-13 17:19:48 +08:00
Gordon
7c90baf7bf remove online offline split 2022-06-12 18:27:01 +08:00
skiffer-git
202811f3c6 groupID digitization 2022-06-10 13:32:40 +08:00
wangchuxiao
2b596e226a Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-09 15:44:31 +08:00
skiffer-git
11e619d1b3 log 2022-06-09 14:26:18 +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
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
6525d63459 fix bug 2022-06-09 12:39:28 +08:00
wangchuxiao
bd14739a9e fix bug 2022-06-08 18:40:07 +08:00
wangchuxiao
a115151616 fix bug 2022-06-08 17:08:47 +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
fa5f234a38 fix bug 2022-06-08 15:40:33 +08:00
wangchuxiao
5d2c981368 fix bug 2022-06-08 15:27:50 +08:00
wangchuxiao
4a55842724 fix bug 2022-06-08 15:26:31 +08:00
wangchuxiao
e9655ed05e fix bug 2022-06-08 15:15:56 +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
7d0c8b0c5f super group add notification 2022-06-07 19:02:19 +08:00
skiffer-git
0463f5e83d fix bug 2022-06-07 18:25:08 +08:00
skiffer-git
eb90314b38 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-07 18:10:02 +08:00
skiffer-git
6ce1d60ebb log 2022-06-07 18:09:11 +08:00
wangchuxiao
5fa62c9fbd Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-07 17:46:53 +08:00
Gordon
ef93a1f42e add conversation sync 2022-06-07 17:45:07 +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
wangchuxiao
269df23851 set group memberInfo 2022-06-07 17:06:47 +08:00
wangchuxiao
c40dc64bd0 set group memberInfo 2022-06-07 16:59:05 +08:00
wangchuxiao
8f1e439381 Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun 2022-06-07 16:18:32 +08:00
skiffer-git
4418d031e1 log 2022-06-07 16:18:23 +08:00
wangchuxiao
f3fc452904 group set memberInfo 2022-06-07 16:18:18 +08:00
skiffer-git
dae1569f0e debug userid == "" 2022-06-07 14:02:11 +08:00