102 Commits

Author SHA1 Message Date
wangchuxiao
82a8f18e88 merge cms into v2.3.0release 2022-09-05 18:28:11 +08:00
Gordon
f6137dfc34 fcm ios push badge 2022-09-02 22:03:35 +08:00
wangchuxiao
6dfbb90b80 fix signal 2022-09-02 17:22:27 +08:00
skiffer-git
e990118475 fix bug :pushMsg.MsgData.OfflinePushInfo==nil 2022-09-01 21:58:22 +08:00
Gordon
67e5e3b56b fcm ios push badge 2022-09-01 21:05:16 +08:00
wangchuxiao
caea072f7d fcm 2022-08-31 14:53:16 +08:00
wangchuxiao
04b22c1a76 Merge branch 'v2.3.0release' of github.com:OpenIMSDK/Open-IM-Server into v2.3.0release 2022-08-31 11:56:50 +08:00
wangchuxiao
26d9d7630c fcm 2022-08-31 11:55:55 +08:00
skiffer-git
e5a7810d6e add group member cache in msg rpc 2022-08-30 22:04:13 +08:00
skiffer-git
99e913637a add group member cache in push 2022-08-30 21:31:53 +08:00
skiffer-git
67319031ea log 2022-08-30 21:22:14 +08:00
wangchuxiao
d20c89ba21 merge shichuang 2 v2.3.0release 2022-08-21 17:57:44 +08:00
Gordon
9a82dd356c callback add offline info 2022-08-19 13:04:38 +08:00
Gordon
eee98c5175 revoke super group message and push message modify 2022-08-17 20:18:56 +08:00
wangchuxiao
d0a200f652 etcd 2022-08-17 14:57:57 +08:00
wangchuxiao
6f2451edd3 etcd 2022-08-17 12:12:54 +08:00
wangchuxiao
64e1361ef5 fix signal bug 2022-08-16 23:08:16 +08:00
skiffer-git
a1392a7677 GetGroupAllMemberListBySplit 2022-08-04 14:04:29 +08:00
Gordon
18891c554d log add 2022-08-01 17:02:56 +08:00
wangchuxiao
1c85424488 mongodb superGroup 2022-07-29 17:09:21 +08:00
wangchuxiao
e1af587040 mongodb superGroup 2022-07-29 15:56:16 +08:00
wangchuxiao
8f12fa52b4 mongodb superGroup to cache 2022-07-29 14:36:07 +08:00
skiffer-git
dd0d518ecd rename 2022-07-20 21:36:10 +08:00
Gordon
3157f97ae6 push fix bug 2022-07-06 16:14:31 +08:00
wangchuxiao
f82f9567c2 merge super 2 tuoyun 2022-06-17 15:56:19 +08:00
wangchuxiao
0a2951c2eb Merge branch 'superGroup' into tuoyun
# Conflicts:
#	internal/push/logic/push_to_client.go
2022-06-17 15:54:57 +08:00
wangchuxiao
3451d22460 signal 2022-06-17 13:14:38 +08:00
Gordon
9b5bd47760 config file update 2022-06-17 12:39:26 +08:00
skiffer-git
066a7041d8 Handling exception: getcdv3.GetConn == nil 2022-06-16 14:36:59 +08:00
wangchuxiao
077482d759 Merge branch 'tuoyun' into superGroup
# Conflicts:
#	internal/push/logic/push_to_client.go
2022-06-16 12:47:06 +08:00
wangchuxiao
b6634d26d1 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 12:36:00 +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
wangchuxiao
f324bb603d rtc 2022-06-14 16:05:45 +08:00
wangchuxiao
d7884f89f5 rtc 2022-06-14 15:56:06 +08:00
skiffer-git
5be23220e4 super group 2022-06-13 18:27:52 +08:00
wangchuxiao
d881ab5fea signal 2022-06-13 15:04:36 +08:00
skiffer-git
9ae84a69be SuperGroupOnlineBatchPushOneMsg 2022-06-13 14:56:24 +08:00
skiffer-git
f9c2b4c28e SuperGroupOnlineBatchPushOneMsg 2022-06-13 09:00:09 +08:00
skiffer-git
dc10c7e3e7 batch push 2022-06-11 09:23:51 +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
Gordon
55f6aa9ff8 add batch push 2022-06-10 11:08:18 +08:00
Gordon
2ede9ef8ed add batch push 2022-06-09 18:24:32 +08:00
Gordon
cfe01bb820 super group push 2022-06-07 18:45:00 +08:00
Gordon
a87e41eecd super group push 2022-06-07 18:39:43 +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
07b652c1d4 singal offline push 2022-06-07 12:08:53 +08:00
wangchuxiao
f8b4cbcc13 singal offline push 2022-06-06 21:04:11 +08:00
wangchuxiao
538656fcc7 singal offline push 2022-06-06 19:58:31 +08:00