Commit Graph

6304 Commits

Author SHA1 Message Date
wangchuxiao 3bc98aae2d Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 18:17:37 +08:00
wangchuxiao 923e943591 err 2023-06-14 18:17:32 +08:00
Gordon 230513d61b fix: msg rpc panic 2023-06-14 16:30:56 +08:00
Gordon 636b00fe36 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 15:32:47 +08:00
Gordon e7f76f44de fix: friend add create time 2023-06-14 15:32:22 +08:00
withchao 48a8dda4f7 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 15:31:50 +08:00
withchao caf5b0d7c7 WsVerifyToken 2023-06-14 15:31:36 +08:00
wangchuxiao 0a4a7daf71 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 15:25:31 +08:00
wangchuxiao 5cd0f8f1ec hasRead 2023-06-14 15:25:25 +08:00
Gordon 1fb13fa5de refactor: ws add 2023-06-14 15:07:53 +08:00
wangchuxiao d714e16333 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 14:28:10 +08:00
wangchuxiao f2e55fbf12 seq 2023-06-14 14:28:01 +08:00
Gordon 61a7c0f09a refactor: add rpc func 2023-06-14 14:23:55 +08:00
Gordon 996eefc1a0 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 14:20:24 +08:00
Gordon 5ae56fc449 refactor: kick user 2023-06-14 14:20:02 +08:00
wangchuxiao e3b9b5a8cd fix name 2023-06-14 12:23:51 +08:00
wangchuxiao bef052ed8c Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-14 12:20:52 +08:00
wangchuxiao c1b843ea2e set conversation has read max seq 2023-06-14 12:20:47 +08:00
Gordon d3a92132a1 refactor: kick user 2023-06-14 11:53:12 +08:00
withchao 638d2d4282 WsVerifyToken 2023-06-14 11:26:20 +08:00
withchao aa8c250c61 WsVerifyToken 2023-06-14 11:00:44 +08:00
Gordon b3c60aaf10 Merge remote-tracking branch 'origin/errcode' into errcode
# Conflicts:
#	internal/msggateway/n_ws_server.go
2023-06-14 10:49:28 +08:00
Gordon 0124a5c05d refactor: token platformID update 2023-06-14 10:47:18 +08:00
withchao 82e85c7083 WsVerifyToken 2023-06-14 10:15:58 +08:00
Gordon 87d64c6afe Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-14 09:58:38 +08:00
Gordon ad42eaed11 feat: kick user when same terminal login 2023-06-14 09:58:10 +08:00
wangchuxiao dd3f29be68 remove memberList 2023-06-13 20:52:20 +08:00
wangchuxiao 1055a11b03 eng 2 chn 2023-06-13 14:55:58 +08:00
wangchuxiao cefeec9823 msg 2023-06-13 11:05:02 +08:00
wangchuxiao f6dcc2ba44 notification 2023-06-12 20:59:53 +08:00
wangchuxiao 662584a115 is read 2023-06-12 20:45:42 +08:00
wangchuxiao 43f782b6ce isread 2023-06-12 20:43:09 +08:00
wangchuxiao 24120b61c0 mark fix 2023-06-12 20:26:28 +08:00
wangchuxiao 78635e3f2b mark 2023-06-12 20:04:14 +08:00
wangchuxiao be0b5422ee mark log 2023-06-12 20:04:08 +08:00
wangchuxiao 53c28a954a add route 2023-06-12 19:40:01 +08:00
wangchuxiao 6cc801ed06 mark as read and modify pb 2023-06-12 18:52:35 +08:00
wangchuxiao 2e457d5a74 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-12 11:54:49 +08:00
wangchuxiao dacee9e86f cache 2023-06-12 11:54:44 +08:00
Gordon 9d596e76dd Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-12 10:56:02 +08:00
Gordon 358f57fb17 refactor: remove code 2023-06-12 10:55:37 +08:00
wangchuxiao df68e1cb4f Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-11 19:04:11 +08:00
wangchuxiao 75bff3a3dd fix 2023-06-11 19:04:05 +08:00
withchao 493e9b0570 Merge remote-tracking branch 'origin/errcode' into errcode 2023-06-11 16:52:16 +08:00
withchao 24e7941b48 WsVerifyToken 2023-06-11 16:52:01 +08:00
wangchuxiao 89f6bbc6a4 Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode 2023-06-11 16:20:05 +08:00
wangchuxiao 086835a31b mark as read 2023-06-11 16:19:59 +08:00
Gordon e04f633fab feat: add background to conn args when client ws recon 2023-06-11 15:32:53 +08:00
withchao 3d119d4632 ws token 2023-06-11 14:51:17 +08:00
withchao c16e7fc022 ws token 2023-06-11 14:48:30 +08:00