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
2,795 Commits 40 Branches 130 Tags
Commit Graph

1061 Commits

Author SHA1 Message Date
wangchuxiao
2e52867df4 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 12:10:07 +08:00
wangchuxiao
c5eb8a3f9b 入职流程 2022-06-17 12:09:42 +08:00
skiffer-git
cacde08e99 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 11:50:13 +08:00
skiffer-git
9443ed5d49 log for etcd 2022-06-17 11:49:29 +08:00
Gordon
92cb2e7eab config file update 2022-06-17 10:59:50 +08:00
Gordon
04136d5b9d Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:50:24 +08:00
Gordon
fd256a6c28 config file update 2022-06-17 10:50:15 +08:00
wangchuxiao
e64b8841c5 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:45:00 +08:00
wangchuxiao
52ae2c3655 fix bug 2022-06-17 10:44:23 +08:00
skiffer-git
f1b5f56294 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-17 10:43:44 +08:00
skiffer-git
ed3b62480c log for etcd 2022-06-17 10:43:24 +08:00
wangchuxiao
3892883470 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-17 10:37:03 +08:00
wangchuxiao
d1049b8022 fix bug 2022-06-17 10:36:46 +08:00
Gordon
903c39206f msg transfer handle change 2022-06-16 20:35:27 +08:00
Gordon
29dbb36961 user proto modify 2022-06-16 19:33:35 +08:00
wangchuxiao
20851f2a96 fix bug 2022-06-16 19:26:09 +08:00
wangchuxiao
7bbf2b200b fix bug 2022-06-16 19:18:17 +08:00
Gordon
e9ac9faa49 user proto modify 2022-06-16 19:12:50 +08:00
wangchuxiao
a15e644a51 fix bug 2022-06-16 19:09:13 +08:00
Gordon
479679a1c6 user proto modify 2022-06-16 19:02:08 +08:00
Gordon
a50001364f user proto modify 2022-06-16 18:59:17 +08:00
Gordon
57d96b85f1 add global recv opt 2022-06-16 14:47:39 +08:00
wangchuxiao
dd4817a65a Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 14:45:53 +08:00
wangchuxiao
b3dcff2d76 redis interface 2022-06-16 14:45:39 +08:00
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
wangchuxiao
96d3ae86cc Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-16 13:41:18 +08:00
Gordon
7e6e214f08 add global recv opt 2022-06-16 12:41:31 +08:00
Gordon
5e51eebe8a msg handle 2022-06-16 12:21:49 +08:00
skiffer-git
310997f978 update chat.pb 2022-06-16 12:04:57 +08:00
wangchuxiao
1b1f4464ee GlobalRecvMsgOpt 2022-06-16 11:53:43 +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
1a6a0d3592 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-16 10:27:02 +08:00
skiffer-git
0d2c0e91c8 use sarama v1.29.0 2022-06-16 10:26:37 +08:00
Gordon
2e7e278ba4 redis restore 2022-06-15 23:30:33 +08:00
Gordon
afa93aaf9e Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-15 19:20:33 +08:00
Gordon
d74bea25aa redis replace to go_redis 2022-06-15 19:17:49 +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
Gordon
eef47017a3 redis replace to go_redis 2022-06-15 16:39:03 +08:00
Gordon
4315d9dfbb redis replace to go_redis 2022-06-15 16:35:24 +08:00
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