Commit Graph

1084 Commits

Author SHA1 Message Date
Gordon 34fe9596a9 test 2022-06-21 21:22:35 +08:00
Gordon e4d35c2a86 Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-21 21:13:36 +08:00
Gordon af7dde61d6 model update 2022-06-21 21:13:27 +08:00
wenxu12345 a62388759a Handling token exceptions 2022-06-21 20:29:20 +08:00
wenxu12345 9337d150b9 Handling token exceptions 2022-06-21 20:25:34 +08:00
wenxu12345 910876f323 Handling token exceptions 2022-06-21 20:25:13 +08:00
wenxu12345 af152aa9b9 Handling token exceptions 2022-06-21 20:16:01 +08:00
wenxu12345 f34fedd822 Handling token exceptions 2022-06-21 20:13:19 +08:00
wenxu12345 ac7c0015db Handling token exceptions 2022-06-21 20:00:03 +08:00
wenxu12345 1a3b5d018a Handling token exceptions 2022-06-21 19:57:48 +08:00
wenxu12345 d99d7ac63c debug 2022-06-21 19:48:26 +08:00
wenxu12345 c2686beb9b debug 2022-06-21 19:44:02 +08:00
wenxu12345 1bfae7627e debug 2022-06-21 19:39:46 +08:00
wenxu12345 06c523ea81 debug 2022-06-21 19:38:13 +08:00
wenxu12345 7f4e21d4ba debug 2022-06-21 19:24:09 +08:00
wenxu12345 c993bb2f5e debug 2022-06-21 18:58:57 +08:00
wenxu12345 5527f7c78a debug 2022-06-21 18:49:01 +08:00
wenxu12345 8e9ad57173 debug 2022-06-21 18:36:34 +08:00
wangchuxiao b5c20f5be9 Merge branch 'superGroup' of github.com:OpenIMSDK/Open-IM-Server into superGroup 2022-06-21 17:37:30 +08:00
wangchuxiao 59a53c7c73 fix bug 2022-06-21 17:37:22 +08:00
Gordon b242aac7cd jpush add config for ios env mode 2022-06-21 11:27:39 +08:00
skiffer-git 127ad802ff Merge remote-tracking branch 'origin/superGroup' into superGroup 2022-06-20 18:13:13 +08:00
skiffer-git f42a2c9434 kickoff 2022-06-20 18:12:02 +08:00
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